diff --git a/README.md b/README.md
index 1e8a30593620..8fefeb92140b 100644
--- a/README.md
+++ b/README.md
@@ -631,6 +631,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [openVALIDATION](https://openvalidation.io/)
 - [Oracle](https://www.oracle.com/)
 - [Paxos](https://www.paxos.com)
+- [Plaid](https://plaid.com)
 - [PLAID, Inc.](https://plaid.co.jp/)
 - [Ponicode](https://ponicode.dev/)
 - [Pricefx](https://www.pricefx.com/)
diff --git a/bin/utils/test_file_list.yaml b/bin/utils/test_file_list.yaml
index d2d65e328f99..447f6f575833 100644
--- a/bin/utils/test_file_list.yaml
+++ b/bin/utils/test_file_list.yaml
@@ -1,6 +1,6 @@
 ---
 # csharp-netcore test files and image for upload
 - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
-  sha256: aceebba316148a2a803a15ef4e13bbd0b0a1b8d15006cd88adb9b39a620ee451
+  sha256: dae985015ba461297927d544a78267f2def35e07c3f14ca66468fd61e1fd1c26
 - filename: "samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/linux-logo.png"
   sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
diff --git a/docs/generators/ada-server.md b/docs/generators/ada-server.md
index 6b7717e0f1e3..237bb29682bd 100644
--- a/docs/generators/ada-server.md
+++ b/docs/generators/ada-server.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |projectName|GNAT project name| |defaultProject|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/ada.md b/docs/generators/ada.md
index 2871a5fdb8fb..06e405243158 100644
--- a/docs/generators/ada.md
+++ b/docs/generators/ada.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |projectName|GNAT project name| |defaultProject|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/android.md b/docs/generators/android.md
index f4ef1cf9aac3..eaf7e37135d4 100644
--- a/docs/generators/android.md
+++ b/docs/generators/android.md
@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId for use in the generated build.gradle and pom.xml| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template) to use|<dl><dt>**volley**</dt><dd>HTTP client: Volley 1.0.19 (default)</dd><dt>**httpclient**</dt><dd>HTTP client: Apache HttpClient 4.3.6. JSON processing: Gson 2.3.1. IMPORTANT: Android client using HttpClient is not actively maintained and will be depecreated in the next major release.</dd></dl>|null|
 |modelPackage|package for generated models| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/apache2.md b/docs/generators/apache2.md
index f52204e92ab2..8e02718be28b 100644
--- a/docs/generators/apache2.md
+++ b/docs/generators/apache2.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/apex.md b/docs/generators/apex.md
index f6a8721f1a57..f5179a9d7e9d 100644
--- a/docs/generators/apex.md
+++ b/docs/generators/apex.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |classPrefix|Prefix for generated classes. Set this to avoid overwriting existing classes in your org.| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |namedCredential|The named credential name for the HTTP callouts| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/asciidoc.md b/docs/generators/asciidoc.md
index 6574918dafe7..0e309aa541d1 100644
--- a/docs/generators/asciidoc.md
+++ b/docs/generators/asciidoc.md
@@ -19,7 +19,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |infoEmail|an email address to contact for inquiries about the application| |null|
 |infoUrl|a URL where users can get more information about the application| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseInfo|a short description of the license| |null|
 |licenseUrl|a URL pointing to the full license| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/avro-schema.md b/docs/generators/avro-schema.md
index ce7590130f34..2637a9227433 100644
--- a/docs/generators/avro-schema.md
+++ b/docs/generators/avro-schema.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|package for generated classes (where supported)| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/bash.md b/docs/generators/bash.md
index 8b8b273c6c22..a8d3fe169377 100644
--- a/docs/generators/bash.md
+++ b/docs/generators/bash.md
@@ -16,7 +16,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateBashCompletion|Whether to generate the Bash completion script| |false|
 |generateZshCompletion|Whether to generate the Zsh completion script| |false|
 |hostEnvironmentVariable|Name of environment variable where host can be defined (e.g. PETSTORE_HOST='http://api.openapitools.org:8080')| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |processMarkdown|Convert all Markdown Markup into terminal formatting| |false|
 |scriptName|The name of the script that will be generated (e.g. petstore-cli)| |null|
diff --git a/docs/generators/c.md b/docs/generators/c.md
index 448cf98b4bfa..c3a79bad9fcf 100644
--- a/docs/generators/c.md
+++ b/docs/generators/c.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/clojure.md b/docs/generators/clojure.md
index 398d9d137922..f5fce29a05bf 100644
--- a/docs/generators/clojure.md
+++ b/docs/generators/clojure.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |baseNamespace|the base/top namespace (Default: generated from projectName)| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |projectDescription|description of the project (Default: using info.description or &quot;Client library of &lt;projectName&gt;&quot;)| |null|
 |projectLicenseName|name of the license the project uses (Default: using info.license.name or not included in project.clj)| |null|
diff --git a/docs/generators/cpp-qt5-client.md b/docs/generators/cpp-qt5-client.md
index 282c674f9edd..ce9e00428f88 100644
--- a/docs/generators/cpp-qt5-client.md
+++ b/docs/generators/cpp-qt5-client.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
 |optionalProjectFile|Generate client.pri.| |true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/cpp-qt5-qhttpengine-server.md b/docs/generators/cpp-qt5-qhttpengine-server.md
index 32631d6b36ca..3467f16775b9 100644
--- a/docs/generators/cpp-qt5-qhttpengine-server.md
+++ b/docs/generators/cpp-qt5-qhttpengine-server.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_|
diff --git a/docs/generators/cpp-tizen.md b/docs/generators/cpp-tizen.md
index 44da899231a6..c38ec6f5e5c5 100644
--- a/docs/generators/cpp-tizen.md
+++ b/docs/generators/cpp-tizen.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/cpp-ue4.md b/docs/generators/cpp-ue4.md
index 716c2fdd1289..ec7e4f3d3239 100644
--- a/docs/generators/cpp-ue4.md
+++ b/docs/generators/cpp-ue4.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |optionalProjectFile|Generate Build.cs| |true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |reservedWordPrefix|Prefix to prepend to reserved words in order to avoid conflicts| |r_|
diff --git a/docs/generators/crystal.md b/docs/generators/crystal.md
index 8965a800fff1..b04bf88eed6f 100644
--- a/docs/generators/crystal.md
+++ b/docs/generators/crystal.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |shardAuthor|shard author (only one is supported).| |null|
 |shardAuthorEmail|shard author email (only one is supported).| |null|
diff --git a/docs/generators/cwiki.md b/docs/generators/cwiki.md
index 85b68be199bf..0c09a332932b 100644
--- a/docs/generators/cwiki.md
+++ b/docs/generators/cwiki.md
@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |infoEmail|an email address to contact for inquiries about the application| |null|
 |infoUrl|a URL where users can get more information about the application| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseInfo|a short description of the license| |null|
 |licenseUrl|a URL pointing to the full license| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/dart-dio.md b/docs/generators/dart-dio.md
index ebbc40b5430d..916d3837ab76 100644
--- a/docs/generators/dart-dio.md
+++ b/docs/generators/dart-dio.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**core**</dt><dd>Dart core library (DateTime)</dd><dt>**timemachine**</dt><dd>Time Machine is date and time library for Flutter, Web, and Server with support for timezones, calendars, cultures, formatting and parsing.</dd></dl>|core|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |nullableFields|Make all fields nullable in the JSON payload| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |pubAuthor|Author name in generated pubspec| |null|
diff --git a/docs/generators/dart-jaguar.md b/docs/generators/dart-jaguar.md
index 3ecb03d5221a..0960f02886b3 100644
--- a/docs/generators/dart-jaguar.md
+++ b/docs/generators/dart-jaguar.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |nullableFields|Is the null fields should be in the JSON payload| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |pubAuthor|Author name in generated pubspec| |null|
diff --git a/docs/generators/dart.md b/docs/generators/dart.md
index 115126907ea8..fb835a98ee0a 100644
--- a/docs/generators/dart.md
+++ b/docs/generators/dart.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |pubAuthor|Author name in generated pubspec| |null|
 |pubAuthorEmail|Email address of the author in generated pubspec| |null|
diff --git a/docs/generators/dynamic-html.md b/docs/generators/dynamic-html.md
index d3f6a33ff88f..6c0076fc7fa9 100644
--- a/docs/generators/dynamic-html.md
+++ b/docs/generators/dynamic-html.md
@@ -14,7 +14,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/elixir.md b/docs/generators/elixir.md
index 835a32834af4..cb8bd35d33a3 100644
--- a/docs/generators/elixir.md
+++ b/docs/generators/elixir.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay.Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseHeader|The license header to prepend to the top of all source files.| |null|
 |packageName|Elixir package name (convention: lowercase).| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/fsharp-functions.md b/docs/generators/fsharp-functions.md
index f7f04c944bb0..bb16f39fa776 100644
--- a/docs/generators/fsharp-functions.md
+++ b/docs/generators/fsharp-functions.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |NoLicense|
 |licenseUrl|The URL of the license| |http://localhost|
 |packageAuthors|Specifies Authors property in the .NET Core project file.| |OpenAPI|
diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 73c3868b1fa6..4cd2af16f909 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -30,7 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/haskell-http-client.md b/docs/generators/haskell-http-client.md
index 64af72a10600..0a6a11a6dcfe 100644
--- a/docs/generators/haskell-http-client.md
+++ b/docs/generators/haskell-http-client.md
@@ -27,7 +27,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |generateModelConstructors|Generate smart constructors (only supply required fields) for models| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |inlineMimeTypes|Inline (hardcode) the content-type and accept parameters on operations, when there is only 1 option| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelDeriving|Additional classes to include in the deriving() clause of Models| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |requestType|Set the name of the type used to generate requests| |null|
diff --git a/docs/generators/haskell.md b/docs/generators/haskell.md
index e30ca6619919..5ce44c462af1 100644
--- a/docs/generators/haskell.md
+++ b/docs/generators/haskell.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |apiPackage|package for generated api classes| |null|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |serveStatic|serve will serve files from the directory 'static'.| |true|
diff --git a/docs/generators/html.md b/docs/generators/html.md
index 4408781d0101..225daac75448 100644
--- a/docs/generators/html.md
+++ b/docs/generators/html.md
@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |infoEmail|an email address to contact for inquiries about the application| |null|
 |infoUrl|a URL where users can get more information about the application| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseInfo|a short description of the license| |null|
 |licenseUrl|a URL pointing to the full license| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/html2.md b/docs/generators/html2.md
index cfeb2cc0dc2d..e69d26edf61f 100644
--- a/docs/generators/html2.md
+++ b/docs/generators/html2.md
@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |infoEmail|an email address to contact for inquiries about the application| |null|
 |infoUrl|a URL where users can get more information about the application| |null|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseInfo|a short description of the license| |null|
 |licenseUrl|a URL pointing to the full license| |null|
 |packageName|C# package name| |null|
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index b82ecd1964db..373bc61861b2 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.controllers|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index afa59addfcb3..e0d62c36cd7a 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 1c457b6afea1..be689abd329b 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |com.prokarma.pkmst.controller|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |com.prokarma.pkmst.model|
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index 33cfb5eb89ee..3f926d08a2d1 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -36,7 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |apimodels|
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index fa844da00243..9b70a6763f5a 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.handler|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |null|
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 37ee8e280c6b..78118f1a4d7a 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.vertxweb.server|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.vertxweb.server.model|
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index 4549726d3546..c1b480b012a3 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.server.api.model|
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 6aef6a380753..6de9ed101b0a 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -35,7 +35,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.client|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.9.x. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.9.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 10.x. JSON processing: Jackson 2.9.x.</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2/3]=true'. (RxJava 1.x or 2.x or 3.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.9.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.9.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.9.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x or Jackson 2.10.x. Only for Java 8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dt>**microprofile**</dt><dd>HTTP client: Microprofile client 1.x. JSON processing: Jackson 2.9.x</dd></dl>|okhttp-gson|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/javascript-apollo.md b/docs/generators/javascript-apollo.md
index ae5d6550b743..44a7ccac561a 100644
--- a/docs/generators/javascript-apollo.md
+++ b/docs/generators/javascript-apollo.md
@@ -14,7 +14,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|name of the license the project uses (Default: using info.license.name)| |null|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
diff --git a/docs/generators/javascript-closure-angular.md b/docs/generators/javascript-closure-angular.md
index de976f2eeafd..8d9c3b14a14c 100644
--- a/docs/generators/javascript-closure-angular.md
+++ b/docs/generators/javascript-closure-angular.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/javascript-flowtyped.md b/docs/generators/javascript-flowtyped.md
index 9e2691140564..eca0bf2e0808 100644
--- a/docs/generators/javascript-flowtyped.md
+++ b/docs/generators/javascript-flowtyped.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/javascript.md b/docs/generators/javascript.md
index f98e8951dae7..a0bb2d24c952 100644
--- a/docs/generators/javascript.md
+++ b/docs/generators/javascript.md
@@ -15,7 +15,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |invokerPackage|root package for generated code| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|name of the license the project uses (Default: using info.license.name)| |null|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
@@ -64,9 +64,16 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>Array</li>
+<li>Date</li>
+<li>Infinity</li>
+<li>Math</li>
+<li>NaN</li>
+<li>Number</li>
+<li>Object</li>
+<li>String</li>
 <li>abstract</li>
 <li>arguments</li>
-<li>array</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
@@ -76,7 +83,6 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>class</li>
 <li>const</li>
 <li>continue</li>
-<li>date</li>
 <li>debugger</li>
 <li>default</li>
 <li>delete</li>
@@ -94,27 +100,22 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>for</li>
 <li>function</li>
 <li>goto</li>
-<li>hasownproperty</li>
+<li>hasOwnProperty</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>in</li>
-<li>infinity</li>
 <li>instanceof</li>
 <li>int</li>
 <li>interface</li>
-<li>isfinite</li>
-<li>isnan</li>
-<li>isprototypeof</li>
+<li>isFinite</li>
+<li>isNaN</li>
+<li>isPrototypeOf</li>
 <li>let</li>
 <li>long</li>
-<li>math</li>
-<li>nan</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
-<li>number</li>
-<li>object</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
@@ -123,20 +124,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>return</li>
 <li>short</li>
 <li>static</li>
-<li>string</li>
 <li>super</li>
 <li>switch</li>
 <li>synchronized</li>
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
-<li>tostring</li>
+<li>toString</li>
 <li>transient</li>
 <li>true</li>
 <li>try</li>
 <li>typeof</li>
 <li>undefined</li>
-<li>valueof</li>
+<li>valueOf</li>
 <li>var</li>
 <li>void</li>
 <li>volatile</li>
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index ef56b4d6ec22..7cd7ed52c80a 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -36,7 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**&lt;default&gt;**</dt><dd>JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)</dd><dt>**quarkus**</dt><dd>Server using Quarkus</dd><dt>**thorntail**</dt><dd>Server using Thorntail</dd><dt>**openliberty**</dt><dd>Server using Open Liberty</dd><dt>**helidon**</dt><dd>Server using Helidon</dd><dt>**kumuluzee**</dt><dd>Server using KumuluzEE</dd></dl>|&lt;default&gt;|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 09fd7e6f4063..fb3547c920d8 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -32,7 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ignoreAnyOfInEnum|Ignore anyOf keyword in enum| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index 5d0662886fa6..39c9dcba665b 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -39,7 +39,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |loadTestDataFromFile|Load test data from a generated JSON file| |false|
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index 0a58f4838965..915ec4a96b16 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -38,7 +38,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 664d6ed142c2..e79a378b7be6 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -33,7 +33,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**jersey1**</dt><dd>Jersey core 1.x</dd><dt>**jersey2**</dt><dd>Jersey core 2.x</dd></dl>|jersey2|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index e5247bb5495b..c7b5fdd5c1ec 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index e8a4b7a090cf..4be73c6a6d1a 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -34,7 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |implFolder|folder for generated implementation code| |src/main/java|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
 |modelPackage|package for generated models| |org.openapitools.model|
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index 4302199f0f55..1b0425bdfc00 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -36,7 +36,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**&lt;default&gt;**</dt><dd>JAXRS spec only, to be deployed in an app server (TomEE, JBoss, WLS, ...)</dd><dt>**quarkus**</dt><dd>Server using Quarkus</dd><dt>**thorntail**</dt><dd>Server using Thorntail</dd><dt>**openliberty**</dt><dd>Server using Open Liberty</dd><dt>**helidon**</dt><dd>Server using Helidon</dd><dt>**kumuluzee**</dt><dd>Server using KumuluzEE</dd></dl>|&lt;default&gt;|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
diff --git a/docs/generators/jmeter.md b/docs/generators/jmeter.md
index 4b6ad15f974e..1618e2c1ad3b 100644
--- a/docs/generators/jmeter.md
+++ b/docs/generators/jmeter.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/k6.md b/docs/generators/k6.md
index e6ebf43177ec..4c0e735816df 100644
--- a/docs/generators/k6.md
+++ b/docs/generators/k6.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/markdown.md b/docs/generators/markdown.md
index 1726f4eae2b3..f7c1b7e08b72 100644
--- a/docs/generators/markdown.md
+++ b/docs/generators/markdown.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/nim.md b/docs/generators/nim.md
index c12f042bf343..23957ff2d5bf 100644
--- a/docs/generators/nim.md
+++ b/docs/generators/nim.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/nodejs-express-server.md b/docs/generators/nodejs-express-server.md
index 49c8f1e30fb3..a96fa3ec24b7 100644
--- a/docs/generators/nodejs-express-server.md
+++ b/docs/generators/nodejs-express-server.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |serverPort|TCP port to listen on.| |null|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/ocaml.md b/docs/generators/ocaml.md
index 0022ede7bf42..f9f922feee3b 100644
--- a/docs/generators/ocaml.md
+++ b/docs/generators/ocaml.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/openapi-yaml.md b/docs/generators/openapi-yaml.md
index b120c5f31378..d305a85f0db6 100644
--- a/docs/generators/openapi-yaml.md
+++ b/docs/generators/openapi-yaml.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |outputFile|Output filename| |openapi/openapi.yaml|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/openapi.md b/docs/generators/openapi.md
index 0284c656e6ed..caf9e4c9e6bb 100644
--- a/docs/generators/openapi.md
+++ b/docs/generators/openapi.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |outputFileName|Output file name| |openapi.json|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/php-laravel.md b/docs/generators/php-laravel.md
index 231b20da3c48..9c8665cc52eb 100644
--- a/docs/generators/php-laravel.md
+++ b/docs/generators/php-laravel.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-lumen.md b/docs/generators/php-lumen.md
index 36210f796705..9242d70ae45e 100644
--- a/docs/generators/php-lumen.md
+++ b/docs/generators/php-lumen.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-mezzio-ph.md b/docs/generators/php-mezzio-ph.md
index c434a21a0dcf..f691e8f57fb2 100644
--- a/docs/generators/php-mezzio-ph.md
+++ b/docs/generators/php-mezzio-ph.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-silex-deprecated.md b/docs/generators/php-silex-deprecated.md
index 46316276f5dd..9df926cce14e 100644
--- a/docs/generators/php-silex-deprecated.md
+++ b/docs/generators/php-silex-deprecated.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/php-slim-deprecated.md b/docs/generators/php-slim-deprecated.md
index a442c01e4296..016ccd242e20 100644
--- a/docs/generators/php-slim-deprecated.md
+++ b/docs/generators/php-slim-deprecated.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-slim4.md b/docs/generators/php-slim4.md
index 52146c07da7a..cadaf51e5ff8 100644
--- a/docs/generators/php-slim4.md
+++ b/docs/generators/php-slim4.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/php-symfony.md b/docs/generators/php-symfony.md
index 5bdff1fef891..03112d4ff8b4 100644
--- a/docs/generators/php-symfony.md
+++ b/docs/generators/php-symfony.md
@@ -18,7 +18,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |phpLegacySupport|Should the generated code be compatible with PHP 5.x?| |true|
diff --git a/docs/generators/php.md b/docs/generators/php.md
index 177fb0dababb..ab4045d604db 100644
--- a/docs/generators/php.md
+++ b/docs/generators/php.md
@@ -14,7 +14,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |true|
 |invokerPackage|The main namespace to use for all classes. e.g. Yay\Pets| |null|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |packageName|The main package name for classes. e.g. GeneratedPetstore| |null|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/plantuml.md b/docs/generators/plantuml.md
index b4e9c0c6b9e0..2413b540ef09 100644
--- a/docs/generators/plantuml.md
+++ b/docs/generators/plantuml.md
@@ -10,7 +10,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
 |sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
diff --git a/docs/generators/python-aiohttp.md b/docs/generators/python-aiohttp.md
index 7fbe2222c6ae..7c46da0b5b44 100644
--- a/docs/generators/python-aiohttp.md
+++ b/docs/generators/python-aiohttp.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |featureCORS|use flask-cors for handling CORS requests| |false|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
 |packageVersion|python package version.| |1.0.0|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/python-blueplanet.md b/docs/generators/python-blueplanet.md
index 98ee0ad8184b..81c9b89cbf3d 100644
--- a/docs/generators/python-blueplanet.md
+++ b/docs/generators/python-blueplanet.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |featureCORS|use flask-cors for handling CORS requests| |false|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
 |packageVersion|python package version.| |1.0.0|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/python-flask.md b/docs/generators/python-flask.md
index 372272b45ce3..92bf4fdb97fa 100644
--- a/docs/generators/python-flask.md
+++ b/docs/generators/python-flask.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |featureCORS|use flask-cors for handling CORS requests| |false|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |packageName|python package name (convention: snake_case).| |openapi_server|
 |packageVersion|python package version.| |1.0.0|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/ruby.md b/docs/generators/ruby.md
index a313055c18b5..c9e0477e9677 100644
--- a/docs/generators/ruby.md
+++ b/docs/generators/ruby.md
@@ -20,7 +20,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |gemSummary|gem summary. | |A ruby wrapper for the REST APIs|
 |gemVersion|gem version.| |1.0.0|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|HTTP library template (sub-template) to use|<dl><dt>**faraday**</dt><dd>Faraday (https://github.com/lostisland/faraday) (Beta support)</dd><dt>**typhoeus**</dt><dd>Typhoeus &gt;= 1.0.1 (https://github.com/typhoeus/typhoeus)</dd></dl>|typhoeus|
 |moduleName|top module name (convention: CamelCase, usually corresponding to gem name).| |OpenAPIClient|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-akka-http-server.md b/docs/generators/scala-akka-http-server.md
index 98438ff5a6fd..4d3d48c0f6f1 100644
--- a/docs/generators/scala-akka-http-server.md
+++ b/docs/generators/scala-akka-http-server.md
@@ -17,7 +17,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |groupId|groupId in generated pom.xml| |org.openapitools|
 |invokerPackage|root package for generated code| |org.openapitools.server|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-akka.md b/docs/generators/scala-akka.md
index a9a3cc3f9462..4976275245f7 100644
--- a/docs/generators/scala-akka.md
+++ b/docs/generators/scala-akka.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
diff --git a/docs/generators/scala-gatling.md b/docs/generators/scala-gatling.md
index bb038ed557bd..55ce8c23d678 100644
--- a/docs/generators/scala-gatling.md
+++ b/docs/generators/scala-gatling.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-httpclient-deprecated.md b/docs/generators/scala-httpclient-deprecated.md
index c7bc8a05d494..b130d49947e7 100644
--- a/docs/generators/scala-httpclient-deprecated.md
+++ b/docs/generators/scala-httpclient-deprecated.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-lagom-server.md b/docs/generators/scala-lagom-server.md
index ef1387e3d1d4..e0f1e2ddee31 100644
--- a/docs/generators/scala-lagom-server.md
+++ b/docs/generators/scala-lagom-server.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md
index a7de0aee030a..208bdd72c18e 100644
--- a/docs/generators/scala-play-server.md
+++ b/docs/generators/scala-play-server.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |generateCustomExceptions|If set, generates custom exception types.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scala-sttp.md b/docs/generators/scala-sttp.md
index d0068dcfe8c3..5f0c9f7e6adc 100644
--- a/docs/generators/scala-sttp.md
+++ b/docs/generators/scala-sttp.md
@@ -16,7 +16,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |jodaTimeVersion|The version of joda-time library| |2.10.6|
 |json4sVersion|The version of json4s library| |3.6.8|
 |jsonLibrary|Json library to use. Possible values are: json4s and circe.| |json4s|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |mainPackage|Top-level package name, which defines 'apiPackage', 'modelPackage', 'invokerPackage'| |org.openapitools.client|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
diff --git a/docs/generators/scalatra.md b/docs/generators/scalatra.md
index 31556033faad..897421a205d6 100644
--- a/docs/generators/scalatra.md
+++ b/docs/generators/scalatra.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/scalaz.md b/docs/generators/scalaz.md
index c503a4df4139..25355390e08e 100644
--- a/docs/generators/scalaz.md
+++ b/docs/generators/scalaz.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateLibrary|Option. Date library to use|<dl><dt>**joda**</dt><dd>Joda (for legacy app)</dd><dt>**java8**</dt><dd>Java 8 native JSR310 (prefered for JDK 1.8+)</dd></dl>|java8|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPackage|package for generated models| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index b931916c3c81..43614a0a5aa0 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -40,7 +40,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |invokerPackage|root package for generated code| |org.openapitools.api|
 |java8|Use Java8 classes instead of third party equivalents. Starting in 5.x, JDK8 is the default and the support for JDK7, JDK6 has been dropped|<dl><dt>**true**</dt><dd>Use Java 8 classes such as Base64. Use java8 default interface when a responseWrapper is used. IMPORTANT: This option has been deprecated as Java 8 is the default.</dd><dt>**false**</dt><dd>Various third party libraries as needed</dd></dl>|true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |library|library template (sub-template)|<dl><dt>**spring-boot**</dt><dd>Spring-boot Server application using the SpringFox integration.</dd><dt>**spring-mvc**</dt><dd>Spring-MVC Server application using the SpringFox integration.</dd><dt>**spring-cloud**</dt><dd>Spring-Cloud-Feign client with Spring-Boot auto-configured settings.</dd></dl>|spring-boot|
 |licenseName|The name of the license| |Unlicense|
 |licenseUrl|The URL of the license| |http://unlicense.org|
@@ -70,7 +70,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |useBeanValidation|Use BeanValidation API annotations| |true|
 |useOptional|Use Optional container for optional parameters| |false|
 |useTags|use tags for creating interface and controller classnames| |false|
-|virtualService|Generates the virtual service. For more details refer - https://github.com/elan-venture/virtualan/wiki| |false|
+|virtualService|Generates the virtual service. For more details refer - https://github.com/virtualansoftware/virtualan/wiki| |false|
 |withXml|whether to include support for application/xml content type and include XML annotations in the model (works with libraries that provide support for JSON and XML)| |false|
 
 ## IMPORT MAPPING
diff --git a/docs/generators/swift4-deprecated.md b/docs/generators/swift4-deprecated.md
index caa0fbb05095..ef9fed5d5a8f 100644
--- a/docs/generators/swift4-deprecated.md
+++ b/docs/generators/swift4-deprecated.md
@@ -11,7 +11,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |lenientTypeCast|Accept and cast values for simple types (string-&gt;bool, string-&gt;int, int-&gt;string)| |false|
 |nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.(default: false)| |null|
 |objcCompatible|Add additional properties and methods for Objective-C compatibility (default: false)| |null|
diff --git a/docs/generators/swift5.md b/docs/generators/swift5.md
index 624c3ffcb445..ebf6f2b0e86a 100644
--- a/docs/generators/swift5.md
+++ b/docs/generators/swift5.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |lenientTypeCast|Accept and cast values for simple types (string-&gt;bool, string-&gt;int, int-&gt;string)| |false|
 |library|Library template (sub-template) to use|<dl><dt>**urlsession**</dt><dd>[DEFAULT] HTTP client: URLSession</dd><dt>**alamofire**</dt><dd>HTTP client: Alamofire</dd></dl>|urlsession|
 |nonPublicApi|Generates code with reduced access modifiers; allows embedding elsewhere without exposing non-public API calls to consumers.(default: false)| |null|
diff --git a/docs/generators/typescript-angular.md b/docs/generators/typescript-angular.md
index bd90759d0faa..6916e3f662cc 100644
--- a/docs/generators/typescript-angular.md
+++ b/docs/generators/typescript-angular.md
@@ -15,7 +15,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
 |fileNaming|Naming convention for the output files: 'camelCase', 'kebab-case'.| |camelCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelFileSuffix|The suffix of the file of the generated model (model&lt;suffix&gt;.ts).| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |modelSuffix|The suffix of the generated model.| |null|
diff --git a/docs/generators/typescript-angularjs-deprecated.md b/docs/generators/typescript-angularjs-deprecated.md
index 4010f410ec7b..889c9fb3d2d9 100644
--- a/docs/generators/typescript-angularjs-deprecated.md
+++ b/docs/generators/typescript-angularjs-deprecated.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |nullSafeAdditionalProps|Set to make additional properties types declare that their indexer may return undefined| |false|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
diff --git a/docs/generators/typescript-aurelia.md b/docs/generators/typescript-aurelia.md
index 4dca6503d5d9..a1f568cfb65f 100644
--- a/docs/generators/typescript-aurelia.md
+++ b/docs/generators/typescript-aurelia.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmVersion|The version of your npm package. If not provided, using the version from the OpenAPI specification file.| |1.0.0|
diff --git a/docs/generators/typescript-axios.md b/docs/generators/typescript-axios.md
index 74d94a43b260..5bddee541892 100644
--- a/docs/generators/typescript-axios.md
+++ b/docs/generators/typescript-axios.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url of your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-fetch.md b/docs/generators/typescript-fetch.md
index 660d3df50ab9..2acbe8c77413 100644
--- a/docs/generators/typescript-fetch.md
+++ b/docs/generators/typescript-fetch.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-inversify.md b/docs/generators/typescript-inversify.md
index af651c77725e..41df5d2b2b7d 100644
--- a/docs/generators/typescript-inversify.md
+++ b/docs/generators/typescript-inversify.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-jquery.md b/docs/generators/typescript-jquery.md
index b3bb0620bdf0..33713bf6f853 100644
--- a/docs/generators/typescript-jquery.md
+++ b/docs/generators/typescript-jquery.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
 |jqueryAlreadyImported|When using this in legacy app using mix of typescript and javascript, this will only declare jquery and not import it| |false|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-nestjs.md b/docs/generators/typescript-nestjs.md
index 9ec83a6246cb..0697f2266f67 100644
--- a/docs/generators/typescript-nestjs.md
+++ b/docs/generators/typescript-nestjs.md
@@ -13,7 +13,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
 |fileNaming|Naming convention for the output files: 'camelCase', 'kebab-case'.| |camelCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelFileSuffix|The suffix of the file of the generated model (model&lt;suffix&gt;.ts).| |null|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |modelSuffix|The suffix of the generated model.| |null|
diff --git a/docs/generators/typescript-node.md b/docs/generators/typescript-node.md
index 31fbbbfadfbf..8c755639588a 100644
--- a/docs/generators/typescript-node.md
+++ b/docs/generators/typescript-node.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-redux-query.md b/docs/generators/typescript-redux-query.md
index 155847726a4a..f35e028ff4b9 100644
--- a/docs/generators/typescript-redux-query.md
+++ b/docs/generators/typescript-redux-query.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript-rxjs.md b/docs/generators/typescript-rxjs.md
index 58b5f44c244f..05909b89bd27 100644
--- a/docs/generators/typescript-rxjs.md
+++ b/docs/generators/typescript-rxjs.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumNameSuffix|Suffix that will be appended to all enum names.| |Enum|
 |enumPropertyNaming|Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'| |PascalCase|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name. Only change it if you provide your own run-time code for (de-)serialization of models| |original|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/generators/typescript.md b/docs/generators/typescript.md
index 5bd46016c347..e717d93a4dea 100644
--- a/docs/generators/typescript.md
+++ b/docs/generators/typescript.md
@@ -12,7 +12,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |fileContentDataType|Specifies the type to use for the content of a file - i.e. Blob (Browser, Deno) / Buffer (node)| |Buffer|
 |framework|Specify the framework which should be used in the client code.|<dl><dt>**fetch-api**</dt><dd>fetch-api</dd><dt>**jquery**</dt><dd>jquery</dd></dl>|fetch-api|
-|legacyDiscriminatorBehavior|Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
+|legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |modelPropertyNaming|Naming convention for the property: 'camelCase', 'PascalCase', 'snake_case' and 'original', which keeps the original name| |camelCase|
 |npmName|The name under which you want to publish generated npm package. Required to generate a full package| |null|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
diff --git a/docs/usage.md b/docs/usage.md
index bbeb50ea6bb8..a5719e27761a 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -11,7 +11,7 @@ This page demonstrates navigating the options via CLI. Commands are presented he
 The `help` option lists all commands available to the CLI.
 
 ```bash
-openapi-generator help
+openapi-generator-cli help
 usage: openapi-generator-cli <command> [<args>]
 
 The most commonly used openapi-generator-cli commands are:
@@ -50,7 +50,7 @@ OPTIONS
 The `list` command outputs a formatted list of every available generator. Pass the `-s/--short` option if you would like a CSV output for easy parsing.
 
 ```bash
-openapi-generator help list
+openapi-generator-cli help list
 NAME
         openapi-generator-cli list - Lists the available generators
 
@@ -72,7 +72,7 @@ OPTIONS
 Example:
 
 ```bash
-openapi-generator list -s | tr ',' '\n'
+openapi-generator-cli list -s | tr ',' '\n'
 ```
 
 For the full list of generators, refer to the [Generators List](./generators.md).
@@ -82,7 +82,7 @@ For the full list of generators, refer to the [Generators List](./generators.md)
 The `config-help` option provides details about 
 
 ```bash
-openapi-generator help config-help
+openapi-generator-cli help config-help
 NAME
         openapi-generator-cli config-help - Config help for chosen lang
 
@@ -121,7 +121,7 @@ You may pass any generator name (see [list](#list) command) to `-g`, and options
 Example:
 
 ```bash
-openapi-generator config-help -g go
+openapi-generator-cli config-help -g go
 ```
 
 Outputs:
@@ -154,7 +154,7 @@ To pass these go client generator-specific options to the `generate` command for
 The `meta` command creates a new Java class and template files, used for creating your own custom templates.
 
 ```bash
-openapi-generator help meta
+openapi-generator-cli help meta
 NAME
         openapi-generator-cli meta - MetaGenerator. Generator for creating a new
         template set and configuration for Codegen. The output will be based on
@@ -187,7 +187,7 @@ For an in-depth example of using the `meta` command, see [Customization](./custo
 The `validate` command allows you to validate an input specification, optionally providing recommendations for error fixes or other improvements (if available).
 
 ```bash
-openapi-generator help validate
+openapi-generator-cli help validate
 NAME
         openapi-generator-cli validate - Validate specification
 
@@ -205,7 +205,7 @@ OPTIONS
 
 Valid Spec Example (using [petstore-v3.0.yaml](https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator-gradle-plugin/samples/local-spec/petstore-v3.0.yaml))
 ```bash
-openapi-generator validate -i petstore-v3.0.yaml
+openapi-generator-cli validate -i petstore-v3.0.yaml
 ```
 ```text
 Validating spec (petstore-v3.0.yaml)
@@ -215,7 +215,7 @@ No validation issues detected.
 Invalid Spec Example (using [petstore-v3.0-invalid.yaml](https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/modules/openapi-generator-gradle-plugin/samples/local-spec/petstore-v3.0-invalid.yaml)):
 
 ```bash
-openapi-generator validate -i petstore-v3.0-invalid.yaml
+openapi-generator-cli validate -i petstore-v3.0-invalid.yaml
 ```
 ```text
 Validating spec (petstore-v3.0-invalid.yaml)
@@ -232,7 +232,7 @@ Although not documented in the `help` output, the CLI offers a `completion` comm
 This command takes one or more parameters representing the args list you would otherwise pass to `openapi-generator`. For example:
 
 ```bash
-openapi-generator completion config-help
+openapi-generator-cli completion config-help
 -o
 --output
 --named-header
@@ -251,7 +251,7 @@ The `generate` command is the workhorse of the generator toolset. As such, it ha
 
 
 ```bash
-openapi-generator help generate
+openapi-generator-cli help generate
 NAME
         openapi-generator-cli generate - Generate code with the specified
         generator.
@@ -487,7 +487,7 @@ The following examples use [petstore.yaml](https://raw.githubusercontent.com/ope
 Generator-specific options should be passed as `--additional-properties`:
 
 ```bash
-openapi-generator generate -g go --additional-properties=prependFormOrBodyParameters=true \
+openapi-generator-cli generate -g go --additional-properties=prependFormOrBodyParameters=true \
     -o out -i petstore.yaml
 ```
 
@@ -511,7 +511,7 @@ If you're not using your own templates with star/glob package imports, you will
 Here's how one might change the `kotlin-spring` server generator's default of `OffsetDateTime` to `LocalDateTime`:
 
 ```bash
-openapi-generator generate \
+openapi-generator-cli generate \
     -i petstore.yaml \
     -g kotlin-spring \
     -o out \
@@ -574,7 +574,7 @@ For example, one of our typescript samples has the following configuration file:
 These settings can be passed via `-c filename`. Here, we've saved the above as `config.json`:
 
 ```bash
-openapi-generator generate -i petstore.yaml -g typescript-fetch -o out \
+openapi-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
     -c config.json
 ```
 
@@ -592,7 +592,7 @@ The settings are passed exactly the same as for `config.json`. The most importan
 The name of the file should be `config.yml` or `config.yaml` (in our example it will be `config.yaml`.
 
 ```bash
-openapi-generator generate -i petstore.yaml -g typescript-fetch -o out \
+openapi-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
     -c config.yaml
 ```
 
@@ -605,7 +605,7 @@ The `batch` command allows you to move all CLI arguments supported by the `gener
 modified by `--includes-base-dir`. Starting with 5.0.0, the `!batch` command supports multiple `!include` properties, either sequential or nested. In order to support multiple `!include` properties in a JSON file, the property name can have a suffix, e.g. `!include1`, `!include2`, etc. The suffix have no meaning other than providing unique property names.
 
 ```bash
-openapi-generator help batch
+openapi-generator-cli help batch
 NAME
         openapi-generator-cli batch - Generate code in batch via external
         configs.
@@ -675,7 +675,7 @@ additionalProperties:
 EOF
 
 # Generate them
-openapi-generator batch *.yaml
+openapi-generator-cli batch *.yaml
 ```
 
 ## author
@@ -683,7 +683,7 @@ openapi-generator batch *.yaml
 This command group contains utilities for authoring generators or customizing templates.
 
 ```
-openapi-generator help author
+openapi-generator-cli help author
 NAME
         openapi-generator-cli author - Utilities for authoring generators or
         customizing templates.
@@ -754,11 +754,11 @@ Example:
 Extract Java templates, limiting to the `webclient` library.
 
 ```
-openapi-generator author template -g java --library webclient
+openapi-generator-cli author template -g java --library webclient
 ```
 
 Extract all Java templates:
 
 ```
-openapi-generator author template -g java
+openapi-generator-cli author template -g java
 ```
diff --git a/modules/openapi-generator-gradle-plugin/README.adoc b/modules/openapi-generator-gradle-plugin/README.adoc
index 7d082a0fb034..a28290e8c613 100644
--- a/modules/openapi-generator-gradle-plugin/README.adoc
+++ b/modules/openapi-generator-gradle-plugin/README.adoc
@@ -215,7 +215,7 @@ apply plugin: 'org.openapi.generator'
 |Sets mappings between OpenAPI spec types and generated code types.
 
 |additionalProperties
-|Map(String,String)
+|Map(String,Any)
 |None
 |Sets additional properties that can be referenced by the mustache templates.
 
diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt
index 4029ab9c434c..46aa9540cfa3 100644
--- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt
+++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt
@@ -119,7 +119,7 @@ open class OpenApiGeneratorGenerateExtension(project: Project) {
     /**
      * Sets additional properties that can be referenced by the mustache templates.
      */
-    val additionalProperties = project.objects.mapProperty<String, String>()
+    val additionalProperties = project.objects.mapProperty<String, Any>()
 
     /**
      * Sets server variable for server URL template substitution, in the format of name=value,name=value.
diff --git a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
index 3de69d41f531..b1dcd474ae84 100644
--- a/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
+++ b/modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt
@@ -189,7 +189,7 @@ open class GenerateTask : DefaultTask() {
      */
     @Optional
     @Input
-    val additionalProperties = project.objects.mapProperty<String, String>()
+    val additionalProperties = project.objects.mapProperty<String, Any>()
 
     /**
      * Sets server variable for server URL template substitution, in the format of name=value,name=value.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
index 45759aba1443..2e7151dc94e2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
@@ -360,7 +360,7 @@ public class CodegenConstants {
     public static final String REMOVE_ENUM_VALUE_PREFIX_DESC = "Remove the common prefix of enum values";
 
     public static final String LEGACY_DISCRIMINATOR_BEHAVIOR = "legacyDiscriminatorBehavior";
-    public static final String LEGACY_DISCRIMINATOR_BEHAVIOR_DESC = "Set to true for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).";
+    public static final String LEGACY_DISCRIMINATOR_BEHAVIOR_DESC = "Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C#have this enabled by default).";
 
     public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter";
     public static final String USE_SINGLE_REQUEST_PARAMETER_DESC = "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
index 1663343387f2..76bdf64501b3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -65,6 +65,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type
     public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble, isDate, isDateTime;
+    private boolean additionalPropertiesIsAnyType;
     public List<CodegenProperty> vars = new ArrayList<CodegenProperty>(); // all properties (without parent's properties)
     public List<CodegenProperty> allVars = new ArrayList<CodegenProperty>(); // all properties (with parent's properties)
     public List<CodegenProperty> requiredVars = new ArrayList<CodegenProperty>(); // a list of required properties
@@ -712,6 +713,26 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         this.isNull = isNull;
     }
 
+    @Override
+    public boolean getAdditionalPropertiesIsAnyType() {
+        return additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) {
+        this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public boolean getHasVars() {
+        return this.hasVars;
+    }
+
+    @Override
+    public void setHasVars(boolean hasVars) {
+        this.hasVars = hasVars;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -742,6 +763,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 hasOnlyReadOnly == that.hasOnlyReadOnly &&
                 isNull == that.isNull &&
                 hasValidation == that.hasValidation &&
+                getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
                 getUniqueItems() == that.getUniqueItems() &&
                 getExclusiveMinimum() == that.getExclusiveMinimum() &&
                 getExclusiveMaximum() == that.getExclusiveMaximum() &&
@@ -813,7 +835,8 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
                 hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), getVendorExtensions(),
                 getAdditionalPropertiesType(), getMaxProperties(), getMinProperties(), getUniqueItems(), getMaxItems(),
                 getMinItems(), getMaxLength(), getMinLength(), getExclusiveMinimum(), getExclusiveMaximum(), getMinimum(),
-                getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel());
+                getMaximum(), getPattern(), getMultipleOf(), getItems(), getAdditionalProperties(), getIsModel(),
+                getAdditionalPropertiesIsAnyType());
     }
 
     @Override
@@ -899,6 +922,7 @@ public class CodegenModel implements IJsonSchemaValidationProperties {
         sb.append(", isModel='").append(isModel).append('\'');
         sb.append(", isNull='").append(isNull);
         sb.append(", hasValidation='").append(hasValidation);
+        sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType());
         sb.append('}');
         return sb.toString();
     }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java
index 6cbaec8b7474..6a93e266730e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java
@@ -39,6 +39,8 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
     public boolean isArray, isMap;
     public boolean isFile;
     public boolean isEnum;
+    private boolean additionalPropertiesIsAnyType;
+    private boolean hasVars;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
     public CodegenProperty items;
@@ -149,6 +151,8 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         output.pattern = this.pattern;
         output.additionalProperties = this.additionalProperties;
         output.isNull = this.isNull;
+        output.setAdditionalPropertiesIsAnyType(this.getAdditionalPropertiesIsAnyType());
+        output.setHasVars(this.hasVars);
 
         if (this._enum != null) {
             output._enum = new ArrayList<String>(this._enum);
@@ -203,7 +207,7 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
 
     @Override
     public int hashCode() {
-        return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull);
+        return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isContainer, isCollectionFormatMulti, isPrimitiveType, isModel, isExplode, baseName, paramName, dataType, datatypeWithEnum, dataFormat, collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName, style, isDeepObject, example, jsonSchema, isString, isNumeric, isInteger, isLong, isNumber, isFloat, isDouble, isDecimal, isByteArray, isBinary, isBoolean, isDate, isDateTime, isUuid, isUri, isEmail, isFreeFormObject, isAnyType, isArray, isMap, isFile, isEnum, _enum, allowableValues, items, mostInnerItems, additionalProperties, vars, requiredVars, vendorExtensions, hasValidation, getMaxProperties(), getMinProperties(), isNullable, required, getMaximum(), getExclusiveMaximum(), getMinimum(), getExclusiveMinimum(), getMaxLength(), getMinLength(), getPattern(), getMaxItems(), getMinItems(), getUniqueItems(), contentType, multipleOf, isNull, additionalPropertiesIsAnyType, hasVars);
     }
 
     @Override
@@ -248,6 +252,8 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
                 isNullable == that.isNullable &&
                 required == that.required &&
                 isNull == that.isNull &&
+                getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
+                getHasVars() == that.getHasVars() &&
                 getExclusiveMaximum() == that.getExclusiveMaximum() &&
                 getExclusiveMinimum() == that.getExclusiveMinimum() &&
                 getUniqueItems() == that.getUniqueItems() &&
@@ -364,6 +370,8 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
         sb.append(", contentType=").append(contentType);
         sb.append(", multipleOf=").append(multipleOf);
         sb.append(", isNull=").append(isNull);
+        sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType);
+        sb.append(", getHasVars=").append(hasVars);
         sb.append('}');
         return sb.toString();
     }
@@ -591,5 +599,25 @@ public class CodegenParameter implements IJsonSchemaValidationProperties {
 
     @Override
     public void setHasValidation(boolean hasValidation) { this.hasValidation = hasValidation; }
+
+    @Override
+    public boolean getAdditionalPropertiesIsAnyType() {
+        return additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) {
+        this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public boolean getHasVars() {
+        return this.hasVars;
+    }
+
+    @Override
+    public void setHasVars(boolean hasVars) {
+        this.hasVars = hasVars;
+    }
 }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
index 60d32f477129..f00ef51ffba7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java
@@ -185,6 +185,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
     public String xmlName;
     public String xmlNamespace;
     public boolean isXmlWrapped = false;
+    private boolean additionalPropertiesIsAnyType;
+    private boolean hasVars;
 
     public String getBaseName() {
         return baseName;
@@ -693,6 +695,26 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
     @Override
     public void setHasValidation(boolean hasValidation) { this.hasValidation = hasValidation; }
 
+    @Override
+    public boolean getAdditionalPropertiesIsAnyType() {
+        return additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) {
+        this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public boolean getHasVars() {
+        return this.hasVars;
+    }
+
+    @Override
+    public void setHasVars(boolean hasVars) {
+        this.hasVars = hasVars;
+    }
+
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("CodegenProperty{");
@@ -782,6 +804,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
         sb.append(", xmlNamespace='").append(xmlNamespace).append('\'');
         sb.append(", isXmlWrapped=").append(isXmlWrapped);
         sb.append(", isNull=").append(isNull);
+        sb.append(", getAdditionalPropertiesIsAnyType=").append(getAdditionalPropertiesIsAnyType());
+        sb.append(", getHasVars=").append(getHasVars());
         sb.append('}');
         return sb.toString();
     }
@@ -831,6 +855,8 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
                 isXmlAttribute == that.isXmlAttribute &&
                 isXmlWrapped == that.isXmlWrapped &&
                 isNull == that.isNull &&
+                getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
+                getHasVars() == that.getHasVars() &&
                 Objects.equals(openApiType, that.openApiType) &&
                 Objects.equals(baseName, that.baseName) &&
                 Objects.equals(complexType, that.complexType) &&
@@ -892,6 +918,6 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
                 items, mostInnerItems, additionalProperties, vars, requiredVars,
                 vendorExtensions, hasValidation, isInherited, discriminatorValue, nameInCamelCase,
                 nameInSnakeCase, enumName, maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName,
-                xmlNamespace, isXmlWrapped, isNull);
+                xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars);
     }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
index 5db6b721715f..37a21190fc5a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java
@@ -79,6 +79,8 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
     public List<CodegenProperty> vars = new ArrayList<CodegenProperty>(); // all properties (without parent's properties)
     public List<CodegenProperty> requiredVars = new ArrayList<CodegenProperty>();
     private boolean hasValidation;
+    private boolean additionalPropertiesIsAnyType;
+    private boolean hasVars;
 
     @Override
     public int hashCode() {
@@ -89,7 +91,7 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
                 vars, requiredVars, isNull, hasValidation,
                 getMaxProperties(), getMinProperties(), uniqueItems, getMaxItems(), getMinItems(), getMaxLength(),
                 getMinLength(), exclusiveMinimum, exclusiveMaximum, getMinimum(), getMaximum(), getPattern(),
-                is1xx, is2xx, is3xx, is4xx, is5xx);
+                is1xx, is2xx, is3xx, is4xx, is5xx, additionalPropertiesIsAnyType, hasVars);
     }
 
     @Override
@@ -131,6 +133,8 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
                 is3xx == that.is3xx &&
                 is4xx == that.is4xx &&
                 is5xx == that.is5xx &&
+                getAdditionalPropertiesIsAnyType() == that.getAdditionalPropertiesIsAnyType() &&
+                getHasVars() == that.getHasVars() &&
                 Objects.equals(vars, that.vars) &&
                 Objects.equals(requiredVars, that.requiredVars) &&
                 Objects.equals(headers, that.headers) &&
@@ -429,6 +433,8 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
         sb.append(", requiredVars='").append(requiredVars).append('\'');
         sb.append(", isNull='").append(isNull);
         sb.append(", hasValidation='").append(hasValidation);
+        sb.append(", getAdditionalPropertiesIsAnyType=").append(additionalPropertiesIsAnyType);
+        sb.append(", getHasVars=").append(hasVars);
         sb.append('}');
         return sb.toString();
     }
@@ -465,4 +471,24 @@ public class CodegenResponse implements IJsonSchemaValidationProperties {
 
     @Override
     public void setHasValidation(boolean hasValidation) { this.hasValidation = hasValidation; }
+
+    @Override
+    public boolean getAdditionalPropertiesIsAnyType() {
+        return additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType) {
+        this.additionalPropertiesIsAnyType = additionalPropertiesIsAnyType;
+    }
+
+    @Override
+    public boolean getHasVars() {
+        return this.hasVars;
+    }
+
+    @Override
+    public void setHasVars(boolean hasVars) {
+        this.hasVars = hasVars;
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index c5641cde3d68..a5fce66d29c0 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -2579,27 +2579,7 @@ public class DefaultCodegen implements CodegenConfig {
         }
 
         // process 'additionalProperties'
-        if (schema.getAdditionalProperties() == null) {
-            if (disallowAdditionalPropertiesIfNotPresent) {
-                m.isAdditionalPropertiesTrue = false;
-            } else {
-                m.isAdditionalPropertiesTrue = true;
-                CodegenProperty cp = fromProperty("",  new Schema());
-                m.setAdditionalProperties(cp);
-            }
-        } else if (schema.getAdditionalProperties() instanceof Boolean) {
-            if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
-                m.isAdditionalPropertiesTrue = true;
-                CodegenProperty cp = fromProperty("", new Schema());
-                m.setAdditionalProperties(cp);
-            } else {
-                m.isAdditionalPropertiesTrue = false;
-            }
-        } else {
-            m.isAdditionalPropertiesTrue = false;
-            CodegenProperty cp = fromProperty("", (Schema) schema.getAdditionalProperties());
-            m.setAdditionalProperties(cp);
-        }
+        setAddProps(schema, m);
 
         // post process model properties
         if (m.vars != null) {
@@ -2616,15 +2596,48 @@ public class DefaultCodegen implements CodegenConfig {
         return m;
     }
 
-    /**
-     * Recursively look in Schema sc for the discriminator discPropName
-     * and return a CodegenProperty with the dataType and required params set
-     * the returned CodegenProperty may not be required and it may not be of type string
-     *
-     * @param composedSchemaName The name of the sc Schema
-     * @param sc                 The Schema that may contain the discriminator
-     * @param discPropName       The String that is the discriminator propertyName in the schema
-     */
+    private void setAddProps(Schema schema, IJsonSchemaValidationProperties property){
+        CodegenModel m = null;
+        if (property instanceof CodegenModel) {
+            m = (CodegenModel) property;
+        }
+        boolean isAdditionalPropertiesTrue = false;
+        if (schema.getAdditionalProperties() == null) {
+            if (!disallowAdditionalPropertiesIfNotPresent) {
+                isAdditionalPropertiesTrue = true;
+                CodegenProperty cp = fromProperty("",  new Schema());
+                property.setAdditionalProperties(cp);
+                property.setAdditionalPropertiesIsAnyType(true);
+            }
+        } else if (schema.getAdditionalProperties() instanceof Boolean) {
+            if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
+                isAdditionalPropertiesTrue = true;
+                CodegenProperty cp = fromProperty("", new Schema());
+                property.setAdditionalProperties(cp);
+                property.setAdditionalPropertiesIsAnyType(true);
+            }
+        } else {
+            CodegenProperty cp = fromProperty("", (Schema) schema.getAdditionalProperties());
+            property.setAdditionalProperties(cp);
+            if (isAnyTypeSchema((Schema) schema.getAdditionalProperties())) {
+                property.setAdditionalPropertiesIsAnyType(true);
+            }
+        }
+        if (m != null && isAdditionalPropertiesTrue) {
+            m.isAdditionalPropertiesTrue = true;
+        }
+    }
+
+
+        /**
+         * Recursively look in Schema sc for the discriminator discPropName
+         * and return a CodegenProperty with the dataType and required params set
+         * the returned CodegenProperty may not be required and it may not be of type string
+         *
+         * @param composedSchemaName The name of the sc Schema
+         * @param sc                 The Schema that may contain the discriminator
+         * @param discPropName       The String that is the discriminator propertyName in the schema
+         */
     private CodegenProperty discriminatorFound(String composedSchemaName, Schema sc, String discPropName, OpenAPI openAPI) {
         Schema refSchema = ModelUtils.getReferencedSchema(openAPI, sc);
         if (refSchema.getProperties() != null && refSchema.getProperties().get(discPropName) != null) {
@@ -6128,26 +6141,16 @@ public class DefaultCodegen implements CodegenConfig {
             if (objSchema.getRequired() != null) {
                 requiredVars.addAll(objSchema.getRequired());
             }
+            if (objSchema.getProperties() != null && objSchema.getProperties().size() > 0) {
+                property.setHasVars(true);
+            }
             addVars(property, property.getVars(), objSchema.getProperties(), requiredVars);
             List<CodegenProperty> requireCpVars = property.getVars()
                     .stream()
                     .filter(p -> Boolean.TRUE.equals(p.required)).collect(Collectors.toList());
             property.setRequiredVars(requireCpVars);
         }
-        if (schema.getAdditionalProperties() == null) {
-            if (!disallowAdditionalPropertiesIfNotPresent) {
-                CodegenProperty cp = fromProperty("",  new Schema());
-                property.setAdditionalProperties(cp);
-            }
-        } else if (schema.getAdditionalProperties() instanceof Boolean) {
-            if (Boolean.TRUE.equals(schema.getAdditionalProperties())) {
-                CodegenProperty cp = fromProperty("", new Schema());
-                property.setAdditionalProperties(cp);
-            }
-        } else {
-            CodegenProperty cp = fromProperty("", (Schema) schema.getAdditionalProperties());
-            property.setAdditionalProperties(cp);
-        }
+        setAddProps(schema, property);
     }
 
     private void addJsonSchemaForBodyRequestInCaseItsNotPresent(CodegenParameter codegenParameter, RequestBody body) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
index 3d9cd65af29a..fa9c8f535976 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/IJsonSchemaValidationProperties.java
@@ -98,4 +98,12 @@ public interface IJsonSchemaValidationProperties {
     boolean getHasValidation();
 
     void setHasValidation(boolean hasValidation);
-}
+
+    boolean getAdditionalPropertiesIsAnyType();
+
+    void setAdditionalPropertiesIsAnyType(boolean additionalPropertiesIsAnyType);
+
+    boolean getHasVars();
+
+    void setHasVars(boolean hasVars);
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
index 8a2c3c5eb7af..c4dc7b5fd92d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -194,6 +194,11 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
         }
     }
 
+    @Override
+    public String toEnumValue(String value, String datatype) {
+        return escapeText(value);
+    }
+
     @Override
     public String toVarName(String name) {
         if (typeMapping.keySet().contains(name) || typeMapping.values().contains(name)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
index 6e95e56dc2c2..09460b3a7ff1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AspNetCoreServerCodegen.java
@@ -596,7 +596,7 @@ public class AspNetCoreServerCodegen extends AbstractCSharpCodegen {
             LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
             useFrameworkReference = true;
             additionalProperties.put(USE_FRAMEWORK_REFERENCE, useFrameworkReference);
-            additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp" + aspnetCoreVersion);
+            additionalProperties.put(TARGET_FRAMEWORK, "netcoreapp" + aspnetCoreVersion.getOptValue());
         } else if (aspnetCoreVersion.getOptValue().startsWith("5.")) {// default, do nothing
             LOGGER.warn("ASP.NET core version is " + aspnetCoreVersion.getOptValue() + " so changing to use frameworkReference instead of packageReference ");
             useFrameworkReference = true;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
index ed5418ab4a3e..52c5d46bcc12 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
@@ -349,8 +349,12 @@ public class GoClientCodegen extends AbstractGoCodegen {
     public String toDefaultValue(Schema p) {
         p = ModelUtils.getReferencedSchema(this.openAPI, p);
         if (ModelUtils.isStringSchema(p)) {
-            if (p.getDefault() != null) {
-                return "\"" + escapeText((String) p.getDefault()) + "\"";
+            Object defaultObj = p.getDefault();
+            if (defaultObj != null) {
+                if (defaultObj instanceof java.lang.String) {
+                    return "\"" + escapeText((String) defaultObj) + "\"";
+                }
+                return "\"" + escapeText(defaultObj.toString()) + "\"";
             }
             return null;
         }
@@ -602,7 +606,11 @@ public class GoClientCodegen extends AbstractGoCodegen {
         } else if (codegenModel.isEnum) {
             Map<String, Object> allowableValues = codegenModel.allowableValues;
             List<Object> values = (List<Object>) allowableValues.get("values");
-            return goImportAlias + "." + model + "(\"" + String.valueOf(values.get(0)) + "\")";
+            String example = String.valueOf(values.get(0));
+            if (codegenModel.isString) {
+                example = "\"" + example + "\"";
+            }
+            return goImportAlias + "." + model + "(" + example + ")";
         } else if (codegenModel.oneOf != null && !codegenModel.oneOf.isEmpty()) {
             String subModel = (String) codegenModel.oneOf.toArray()[0];
             String oneOf = constructExampleCode(modelMaps.get(subModel), modelMaps, processedModelMap).substring(1);
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
index 26071b4ca61e..79a31e5e9059 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavascriptClientCodegen.java
@@ -114,7 +114,7 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         hideGenerationTimestamp = Boolean.TRUE;
 
         // reference: http://www.w3schools.com/js/js_reserved.asp
-        setReservedWordsLowerCase(
+        reservedWords = new HashSet<>(
                 Arrays.asList(
                         "abstract", "arguments", "boolean", "break", "byte",
                         "case", "catch", "char", "class", "const",
@@ -554,6 +554,11 @@ public class JavascriptClientCodegen extends DefaultCodegen implements CodegenCo
         return name;
     }
 
+    @Override
+    protected boolean isReservedWord(String word) {
+        return word != null && reservedWords.contains(word);
+    }
+
     @Override
     public String toParamName(String name) {
         // should be the same as variable name
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
index 29f2bc72c8a3..f18ecfc0aac9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -419,9 +419,11 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
                 supportingFiles.add(new SupportingFile("settingsGradle.mustache", "", "settings.gradle"));
             }
 
-            supportingFiles.add(new SupportingFile("application.mustache", resourceFolder, "application.yaml"));
-            supportingFiles.add(new SupportingFile("springBootApplication.mustache",
+            if (!this.interfaceOnly) {
+                supportingFiles.add(new SupportingFile("application.mustache", resourceFolder, "application.yaml"));
+                supportingFiles.add(new SupportingFile("springBootApplication.mustache",
                     sanitizeDirectory(sourceFolder + File.separator + basePackage), "Application.kt"));
+            }
         }
 
         // spring uses the jackson lib, and we disallow configuration.
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
index 20b1b04a3971..cf61d6aa76b7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PowerShellClientCodegen.java
@@ -60,7 +60,8 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     protected String licenseUri;
     protected String releaseNotes;
     protected String tags;
-    protected String iconUri; 
+    protected String iconUri;
+    protected Set<String> paramNameReservedWords;
 
     /**
      * Constructs an instance of `PowerShellClientCodegen`.
@@ -415,7 +416,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
                 "local",
                 "private",
                 "where",
-                // special variables 
+                // special variables
                 "args",
                 "consolefilename",
                 "error",
@@ -452,6 +453,30 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
                 "true"
         ));
 
+        paramNameReservedWords = new HashSet<String>(Arrays.asList(
+                "args",
+                "error",
+                "executioncontext",
+                "false",
+                "home",
+                "host",
+                "input",
+                "myinvocation",
+                "nestedpromptlevel",
+                "null",
+                "pid",
+                "profile",
+                "pscommandpath",
+                "psculture",
+                "pshome",
+                "psscriptroot",
+                "psuiculture",
+                "psversiontable",
+                "shellid",
+                "stacktrace",
+                "true"
+        ));
+
         defaultIncludes = new HashSet<String>(Arrays.asList(
                 "Byte",
                 "SByte",
@@ -639,7 +664,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         } else {
             additionalProperties.put("skipVerbParsing", skipVerbParsing);
         }
-        
+
         if (additionalProperties.containsKey("tags")) {
             String[] entries = ((String) additionalProperties.get("tags")).split(",");
             String prefix = "";
@@ -937,7 +962,17 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
 
     @Override
     public String toParamName(String name) {
-        return toVarName(name);
+        // sanitize and camelize parameter name
+        // pet_id => PetId
+        name = camelize(sanitizeName(name));
+
+        // for param name reserved word or word starting with number, append _
+        if (paramNameReservedWords.contains(name) || name.matches("^\\d.*")) {
+            LOGGER.warn(name + " (reserved word or special variable name) cannot be used in naming. Renamed to " + escapeReservedWord(name));
+            name = escapeReservedWord(name);
+        }
+
+        return name;
     }
 
     @Override
@@ -1313,4 +1348,16 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         return null;
     }
 
+    @Override
+    public void postProcess() {
+        System.out.println("################################################################################");
+        System.out.println("# Thanks for using OpenAPI Generator.                                          #");
+        System.out.println("# Please consider donation to help us maintain this project \uD83D\uDE4F                 #");
+        System.out.println("# https://opencollective.com/openapi_generator/donate                          #");
+        System.out.println("#                                                                              #");
+        System.out.println("# This generator has been refactored by wing328 (https://github.com/wing328)   #");
+        System.out.println("# Please support his work directly by purchasing a copy of the eBook \ud83d\udcd8        #");
+        System.out.println("# - OpenAPI Generator for PowerShell Developers      https://bit.ly/3qBWfRJ    #");
+        System.out.println("################################################################################");
+    }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
index 505640121dcf..1d51e2a0b7cc 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java
@@ -1085,13 +1085,13 @@ public class PythonClientCodegen extends PythonLegacyClientCodegen {
             }
             return fullPrefix + example + closeChars;
         } else if (ModelUtils.isArraySchema(schema)) {
-            if (objExample instanceof Iterable) {
-                // If the example is already a list, return it directly instead of wrongly wrap it in another list
-                return fullPrefix + objExample.toString();
-            }
             ArraySchema arrayschema = (ArraySchema) schema;
             Schema itemSchema = arrayschema.getItems();
             String itemModelName = getModelName(itemSchema);
+            if (objExample instanceof Iterable && itemModelName == null) {
+                // If the example is already a list, return it directly instead of wrongly wrap it in another list
+                return fullPrefix + objExample.toString() + closeChars;
+            }
             seenSchemas.add(schema);
             example = fullPrefix + "[" + "\n" + toExampleValueRecursive(itemModelName, itemSchema, objExample, indentationLevel + 1, "", exampleLine + 1, seenSchemas) + ",\n" + closingIndentation + "]" + closeChars;
             return example;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
index 07f69dd984c3..46d4f87ea016 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -160,7 +160,7 @@ public class SpringCodegen extends AbstractJavaCodegen
         cliOptions.add(CliOption.newBoolean(ASYNC, "use async Callable controllers", async));
         cliOptions.add(CliOption.newBoolean(REACTIVE, "wrap responses in Mono/Flux Reactor types (spring-boot only)", reactive));
         cliOptions.add(new CliOption(RESPONSE_WRAPPER, "wrap the responses in given type (Future, Callable, CompletableFuture,ListenableFuture, DeferredResult, HystrixCommand, RxObservable, RxSingle or fully qualified type)"));
-        cliOptions.add(CliOption.newBoolean(VIRTUAL_SERVICE, "Generates the virtual service. For more details refer - https://github.com/elan-venture/virtualan/wiki"));
+        cliOptions.add(CliOption.newBoolean(VIRTUAL_SERVICE, "Generates the virtual service. For more details refer - https://github.com/virtualansoftware/virtualan/wiki"));
         cliOptions.add(CliOption.newBoolean(USE_TAGS, "use tags for creating interface and controller classnames", useTags));
         cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
         cliOptions.add(CliOption.newBoolean(PERFORM_BEANVALIDATION, "Use Bean Validation Impl. to perform BeanValidation", performBeanValidation));
diff --git a/modules/openapi-generator/src/main/resources/Java/api_doc.mustache b/modules/openapi-generator/src/main/resources/Java/api_doc.mustache
index e68b9b1aef1d..55d0244e3a52 100644
--- a/modules/openapi-generator/src/main/resources/Java/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/api_doc.mustache
@@ -95,6 +95,7 @@ Name | Type | Description  | Notes
 - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
 
 {{#responses.0}}
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache b/modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache
index 0a42c19469a5..f56437544658 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo_doc.mustache
@@ -3,6 +3,7 @@
 {{#description}}{{&description}}
 {{/description}}
 {{^vendorExtensions.x-is-one-of-interface}}
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
index d553a7b1278e..1f2caa5a5f4c 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>[2.8.3,3)</version>
+            <version>[2.8.3,2.12.1]</version>
         </dependency>
 
         <!-- Swagger annotations -->
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache
index fdc844423d63..c89e7cf63853 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/README.mustache
@@ -53,8 +53,8 @@ public interface PetClient extends PetApi {
 ## Virtualan :
 
 You can view Virtualan UI by pointing to  
-http://localhost:80//virtualan-ui.html.
+http://localhost:8080//virtualan-ui.html
 
 How to use guide available in the Virtualan wiki  
-https://github.com/elan-venture/virtualan/wiki
+https://github.com/virtualansoftware/virtualan/wiki
 {{/virtualService}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
index 25c44470d098..e2733633e359 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
@@ -176,7 +176,7 @@
         <dependency>
             <groupId>io.virtualan</groupId>
             <artifactId>virtualan-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>2.1.7</version>
         </dependency>
         <!-- HyperSQL DB -->
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache
index b4e85fe168f4..184fe7dcff76 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/Project.csproj.mustache
@@ -3,6 +3,7 @@
     <Description>{{packageName}}</Description>
     <Copyright>{{packageName}}</Copyright>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <Version>{{packageVersion}}</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
     <AssemblyName>{{packageName}}</AssemblyName>
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache
index 963dad63749b..bb25404ee10d 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/Project.csproj.mustache
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp{{aspnetCoreVersion}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>{{packageVersion}}</Version>
 {{#isLibrary}}
     <OutputType>Library</OutputType>
 {{/isLibrary}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
index eaf943b9525c..69d7cca51d2f 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/3.0/Project.csproj.mustache
@@ -5,6 +5,7 @@
     <TargetFramework>{{targetFramework}}</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>{{packageVersion}}</Version>
 {{#isLibrary}}
     <OutputType>Library</OutputType>
 {{/isLibrary}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache
index b999e5997b4e..c16fdbb09467 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-header.mustache
@@ -25,7 +25,16 @@ class {{declspec}} {{classname}}
 public:
     {{classname}}();
     virtual ~{{classname}}();
-
+{{#isEnum}}{{#allowableValues}}
+    enum class e{{classname}} {
+    // To have a valid default value.
+    // Avoiding nameclashes with user defined
+    // enum values
+    INVALID_VALUE_OPENAPI_GENERATED = 0,
+    {{#enumVars}}
+    {{{name}}}{{^-last}}, {{/-last}}
+    {{/enumVars}}
+    };{{/allowableValues}}{{/isEnum}}
     void validate();
 
     /////////////////////////////////////////////
@@ -40,6 +49,10 @@ public:
     bool {{nameInCamelCase}}IsSet() const;
     void unset{{name}}();{{/required}}
     {{/vars}}
+    {{#isEnum}}
+    {{classname}}::e{{classname}} getValue() const;
+    void setValue({{classname}}::e{{classname}} value);
+    {{/isEnum}}
 
     friend void to_json(nlohmann::json& j, const {{classname}}& o);
     friend void from_json(const nlohmann::json& j, {{classname}}& o);
@@ -49,6 +62,9 @@ protected:
     {{^required}}
     bool m_{{name}}IsSet;{{/required}}
     {{/vars}}
+    {{#isEnum}}
+    {{classname}}::e{{classname}} m_value = {{classname}}::e{{classname}}::INVALID_VALUE_OPENAPI_GENERATED;
+    {{/isEnum}}
 };
 
 {{#modelNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
index 03b8d574df46..d603dc2186e0 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
@@ -2,6 +2,8 @@
 {{#models}}{{#model}}
 
 #include "{{classname}}.h"
+{{#isEnum}}#include <stdexcept>
+#include <sstream>{{/isEnum}}
 
 {{#modelNamespaceDeclarations}}
 namespace {{this}} {
@@ -32,6 +34,20 @@ void to_json(nlohmann::json& j, const {{classname}}& o)
     {{#required}}j["{{baseName}}"] = o.m_{{name}};{{/required}}{{^required}}if(o.{{nameInCamelCase}}IsSet(){{#isContainer}} || !o.m_{{name}}.empty(){{/isContainer}})
         j["{{baseName}}"] = o.m_{{name}};{{/required}}
     {{/vars}}
+    {{#isEnum}}{{#allowableValues}}
+    switch (o.getValue())
+    {
+        {{#enumVars}}
+        {{#-first}}
+        case {{classname}}::e{{classname}}::INVALID_VALUE_OPENAPI_GENERATED:
+            j = "INVALID_VALUE_OPENAPI_GENERATED";
+            break;
+        {{/-first}}
+        case {{classname}}::e{{classname}}::{{name}}:
+            j = "{{value}}";
+            break;
+        {{/enumVars}}
+    }{{/allowableValues}}{{/isEnum}}
 }
 
 void from_json(const nlohmann::json& j, {{classname}}& o)
@@ -43,6 +59,19 @@ void from_json(const nlohmann::json& j, {{classname}}& o)
         o.m_{{name}}IsSet = true;
     } {{/required}}
     {{/vars}}
+    {{#isEnum}}{{#allowableValues}}
+    auto s = j.get<std::string>();
+    {{#enumVars}}
+    {{#-first}}if{{/-first}}{{^-first}}else if{{/-first}} (s == "{{value}}") {
+     o.setValue({{classname}}::e{{classname}}::{{name}});
+    } {{#-last}} else {
+     std::stringstream ss;
+     ss << "Unexpected value " << s << " in json"
+        << " cannot be converted to enum of type"
+        << " {{classname}}::e{{classname}}";
+     throw std::invalid_argument(ss.str());
+    } {{/-last}}
+{{/enumVars}}{{/allowableValues}}{{/isEnum}}
 }
 
 {{#vars}}{{{dataType}}}{{#isContainer}}&{{/isContainer}} {{classname}}::{{getter}}(){{^isContainer}} const{{/isContainer}}
@@ -64,6 +93,14 @@ void {{classname}}::unset{{name}}()
 }
 {{/required}}
 {{/vars}}
+{{#isEnum}}{{classname}}::e{{classname}} {{classname}}::getValue() const
+{
+    return m_value;
+}
+void {{classname}}::setValue({{classname}}::e{{classname}} value)
+{
+    m_value = value;
+}{{/isEnum}}
 
 {{#modelNamespaceDeclarations}}
 }
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
index 4c4cbbb6648b..5eca0f0f0a4b 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
@@ -423,10 +423,26 @@ void {{prefix}}HttpRequestWorker::on_reply_timeout(QNetworkReply *reply) {
 }
 
 void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) {
-    if (getResponseHeaders().contains(QString("Content-Disposition"))) {
-        auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS);
+    QString contentDispositionHdr;
+    QString contentTypeHdr;
+    QString contentEncodingHdr;
+
+    for(auto hdr: getResponseHeaders().keys()){
+        if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){
+            contentDispositionHdr = getResponseHeaders().value(hdr);
+        }
+        if(hdr.compare(QString("Content-Type"), Qt::CaseInsensitive) == 0){
+            contentTypeHdr = getResponseHeaders().value(hdr);
+        }
+        if(hdr.compare(QString("Content-Encoding"), Qt::CaseInsensitive) == 0){
+            contentEncodingHdr = getResponseHeaders().value(hdr);
+        }
+    }
+
+    if (!contentDispositionHdr.isEmpty()) {
+        auto contentDisposition = contentDispositionHdr.split(QString(";"), SKIP_EMPTY_PARTS);
         auto contentType =
-            getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
+            !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
         if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) {
             QString filename = QUuid::createUuid().toString();
             for (const auto &file : contentDisposition) {
@@ -440,13 +456,13 @@ void {{prefix}}HttpRequestWorker::process_response(QNetworkReply *reply) {
             files.insert(filename, felement);
         }
 
-    } else if (getResponseHeaders().contains(QString("Content-Type"))) {
-        auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS);
+    } else if (!contentTypeHdr.isEmpty()) {
+        auto contentType = contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS);
         if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) {
             // TODO : Handle Multipart responses
         } else {
-            if(headers.contains("Content-Encoding")){
-                auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS);
+            if(!contentEncodingHdr.isEmpty()){
+                auto encoding = contentEncodingHdr.split(QString(";"), SKIP_EMPTY_PARTS);
                 if(encoding.count() > 0){
                     auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS);
                     if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
index fa562529c559..6e290e6eb85d 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
@@ -663,6 +663,12 @@ void {{classname}}::{{nickname}}({{#allParams}}{{#required}}const {{{dataType}}}
 
     connect(worker, &{{prefix}}HttpRequestWorker::on_execution_finished, this, &{{classname}}::{{nickname}}Callback);
     connect(this, &{{classname}}::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<{{prefix}}HttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
index ec9228f4f6ab..ef0a61ff1931 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
@@ -87,6 +87,7 @@ signals:
     void {{nickname}}SignalEFull({{prefix}}HttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);{{/operation}}{{/operations}}
 
     void abortRequestsSignal(); 
+    void allPendingRequestsCompleted();
 };
 
 {{#cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache b/modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache
index 40cfc87c114e..43e695a6ffda 100644
--- a/modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-tizen-client/doc-readme.mustache
@@ -38,6 +38,7 @@ Check out [Doxygen](https://www.doxygen.org/) for additional information about t
 ## I Don't want to run Doxygen. What are the API files for accessing the REST endpoints?
 All URIs are relative to {{{scheme}}}://{{{host}}}{{{basePath}}}
 {{#apiInfo}}{{#apis}}{{#operations}}
+
 ### {{classname}}
 Method | HTTP request | Description
 ------------- | ------------- | -------------
diff --git a/modules/openapi-generator/src/main/resources/csharp-dotnet2/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-dotnet2/model_doc.mustache
index 2e748e0f0f56..e6f7f2c9b83d 100644
--- a/modules/openapi-generator/src/main/resources/csharp-dotnet2/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-dotnet2/model_doc.mustache
@@ -1,6 +1,7 @@
 {{#models}}
 {{#model}}
 # {{{modelPackage}}}.{{{classname}}}
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
index 506966068ac2..3414ccaf8b33 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/ApiClient.mustache
@@ -95,8 +95,6 @@ namespace {{packageName}}.Client
         /// <returns>Object representation of the JSON string.</returns>
         internal object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
-
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -106,13 +104,13 @@ namespace {{packageName}}.Client
             if (type == typeof(Stream))
             {
                 var bytes = response.RawBytes;
-                if (headers != null)
+                if (response.Headers != null)
                 {
                     var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath)
                         ? Path.GetTempPath()
                         : _configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
-                    foreach (var header in headers)
+                    foreach (var header in response.Headers)
                     {
                         var match = regex.Match(header.ToString());
                         if (match.Success)
@@ -482,10 +480,7 @@ namespace {{packageName}}.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
@@ -602,10 +597,7 @@ namespace {{packageName}}.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache
index 554094f9754e..597f503e5580 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/HttpSigningConfiguration.mustache
@@ -137,16 +137,16 @@ namespace {{packageName}}.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace {{packageName}}.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace {{packageName}}.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace {{packageName}}.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace {{packageName}}.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace {{packageName}}.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace {{packageName}}.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace {{packageName}}.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace {{packageName}}.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace {{packageName}}.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace {{packageName}}.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace {{packageName}}.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache
index 85a2b7dea88a..0fd9f8790611 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/api_doc.mustache
@@ -108,6 +108,7 @@ Name | Type | Description  | Notes
  - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
 
 {{#responses.0}}
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
index d775c4d9817d..9c6b01d52efd 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/httpclient/ApiClient.mustache
@@ -359,10 +359,13 @@ namespace {{packageName}}.Client
 
             if (response != null)
             {
-                foreach (Cookie cookie in handler.CookieContainer.GetCookies(uri))
-                {
-                   transformed.Cookies.Add(cookie);
+                try {
+                    foreach (Cookie cookie in handler.CookieContainer.GetCookies(uri))
+                    {
+                       transformed.Cookies.Add(cookie);
+                    }
                 }
+                catch (PlatformNotSupportedException) {}
             }
 
             return transformed;
@@ -450,10 +453,7 @@ namespace {{packageName}}.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof({{{packageName}}}.{{modelPackage}}.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T) Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] {response.Content});
-                responseData = instance;
+                responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache
index 4f1df45f55ae..6b26e1245a03 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/modelOneOf.mustache
@@ -113,11 +113,6 @@
                 {{#mappedModels}}
                 case "{{{mappingName}}}":
                     new{{classname}} = new {{classname}}(JsonConvert.DeserializeObject<{{{modelName}}}>(jsonString, {{classname}}.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (new{{{classname}}}.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        new{{classname}} = new {{classname}}(JsonConvert.DeserializeObject<{{{modelName}}}>(jsonString, {{classname}}.SerializerSettings));
-                    }
                     return new{{classname}};
                 {{/mappedModels}}
                 default:
@@ -133,12 +128,15 @@
 
             try
             {
-                new{{classname}} = new {{classname}}(JsonConvert.DeserializeObject<{{{.}}}>(jsonString, {{classname}}.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (new{{{classname}}}.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof({{{.}}}).GetProperty("AdditionalProperties") == null)
                 {
                     new{{classname}} = new {{classname}}(JsonConvert.DeserializeObject<{{{.}}}>(jsonString, {{classname}}.SerializerSettings));
                 }
+                else
+                {
+                    new{{classname}} = new {{classname}}(JsonConvert.DeserializeObject<{{{.}}}>(jsonString, {{classname}}.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("{{{.}}}");
                 match++;
             }
diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
index 0770b36be17b..babf25481c4e 100644
--- a/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp-netcore/model_doc.mustache
@@ -3,6 +3,7 @@
 # {{{packageName}}}.{{modelPackage}}.{{{classname}}}
 {{#description}}{{&description}}
 {{/description}}
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache b/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache
index 2e6ab1b3f045..5b1c686cd371 100644
--- a/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/csharp/api_doc.mustache
@@ -113,6 +113,7 @@ Name | Type | Description  | Notes
 - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
 
 {{#responses.0}}
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache
index 42f24a05c2b6..8aea662a61ad 100644
--- a/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache
@@ -2,16 +2,16 @@ name: {{pubName}}
 version: {{pubVersion}}
 description: {{pubDescription}}
 environment:
-    sdk: ">=2.7.0 <3.0.0"
+    sdk: '>=2.7.0 <3.0.0'
 dependencies:
     dio: ^3.0.9
-    built_value: ">=7.1.0 <9.0.0"
-    built_collection: ">=4.3.2 <6.0.0"
+    built_value: '>=7.1.0 <8.0.0'
+    built_collection: '>=4.3.2 <5.0.0'
 {{#timeMachine}}
     time_machine: ^0.9.12
 {{/timeMachine}}
 dev_dependencies:
-    built_value_generator: ">=7.1.0 <9.0.0"
+    built_value_generator: '>=7.1.0 <8.0.0'
     build_runner: ^1.7.1
-    test: ">=1.3.0 <1.16.0"
+    test: '>=1.3.0 <1.16.0'
 
diff --git a/modules/openapi-generator/src/main/resources/dart2/api.mustache b/modules/openapi-generator/src/main/resources/dart2/api.mustache
index ad30ec2cdf03..61ecab963b67 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api.mustache
@@ -61,7 +61,7 @@ class {{{classname}}} {
     {{/allParams}}
 
   {{/hasParams}}
-    final path = '{{{path}}}'{{#pathParams}}
+    final path = r'{{{path}}}'{{#pathParams}}
       .replaceAll('{' + '{{{baseName}}}' + '}', {{{paramName}}}.toString()){{/pathParams}};
 
     Object postBody{{#bodyParam}} = {{{paramName}}}{{/bodyParam}};
@@ -185,21 +185,47 @@ class {{{classname}}} {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      {{#isArray}}
+    {{#native_serialization}}
+    {{#isArray}}
       return (apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as List)
         .cast<{{{returnBaseType}}}>()
         .{{#uniqueItems}}toSet(){{/uniqueItems}}{{^uniqueItems}}toList(growable: false){{/uniqueItems}};
-      {{/isArray}}
-      {{^isArray}}
-        {{#isMap}}
+    {{/isArray}}
+    {{^isArray}}
+    {{#isMap}}
       return {{{returnType}}}.from(apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}'));
-        {{/isMap}}
-        {{^isMap}}
+    {{/isMap}}
+    {{^isMap}}
       return apiClient.deserialize(_decodeBodyBytes(response), '{{{returnType}}}') as {{{returnType}}};
-        {{/isMap}}
-      {{/isArray}}
+    {{/isMap}}{{/isArray}}{{/native_serialization}}{{#json_serializable}}
+    {{#isArray}}
+      {{#uniqueItems}}
+      return (json.decode(response.body) as List)
+        .map((i) => {{{returnBaseType}}}.fromJson(i))
+        .toSet();
+      {{/uniqueItems}}
+      {{^uniqueItems}}
+      return (json.decode(response.body) as List)
+        .map((i) => {{{returnBaseType}}}.fromJson(i))
+        .toList();
+      {{/uniqueItems}}
+    {{/isArray}}
+    {{^isArray}}
+    {{#isMap}}
+      return {{{returnType}}}.from(json.decode(response.body));
+    {{/isMap}}
+    {{^isMap}}
+    {{#returnTypeIsPrimitive}}
+      return response.body as {{{returnBaseType}}};
+    {{/returnTypeIsPrimitive}}
+    {{^returnTypeIsPrimitive}}
+      return {{{returnType}}}.fromJson(json.decode(response.body));
+    {{/returnTypeIsPrimitive}}
+    {{/isMap}}
+    {{/isArray}}
+    {{/json_serializable}}
     }
-    return null;
+    return Future<{{{returnType}}}>.value(null);
     {{/returnType}}
   }
   {{/operation}}
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
index e231ff72859d..a5d3b0948e7c 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
@@ -56,17 +56,6 @@ class ApiClient {
   Map<String, Authentication> get authentications =>
       Map.unmodifiable(_authentications);
 
-  dynamic deserialize(String json, String targetType, {bool growable}) {
-    // Remove all spaces.  Necessary for reg expressions as well.
-    targetType = targetType.replaceAll(' ', '');
-
-    return targetType == 'String'
-      ? json
-      : _deserialize(jsonDecode(json), targetType, growable: true == growable);
-  }
-
-  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
-
   T getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
@@ -159,6 +148,7 @@ class ApiClient {
     throw ApiException(HttpStatus.badRequest, 'Invalid HTTP operation: $method $path',);
   }
 
+{{#native_serialization}}
   dynamic _deserialize(dynamic value, String targetType, {bool growable}) {
     try {
       switch (targetType) {
@@ -216,6 +206,18 @@ class ApiClient {
     throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);
   }
 
+  dynamic deserialize(String json, String targetType, {bool growable}) {
+    // Remove all spaces.  Necessary for reg expressions as well.
+    targetType = targetType.replaceAll(' ', '');
+
+  return targetType == 'String'
+    ? json
+    : _deserialize(jsonDecode(json), targetType, growable: true == growable);
+  }
+{{/native_serialization}}
+
+  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
+
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
   void _updateParamsForAuth(
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
index 823829acd9c8..8e70b9920bfb 100644
--- a/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
+++ b/modules/openapi-generator/src/main/resources/dart2/api_helper.mustache
@@ -53,8 +53,7 @@ String parameterToString(dynamic value) {
     {{#model}}
       {{#isEnum}}
   if (value is {{{classname}}}) {
-{{#native_serialization}}    return {{{classname}}}TypeTransformer().encode(value).toString();{{/native_serialization}}
-{{#json_serializable}}    return _${{{classname}}}EnumMap[value];{{/json_serializable}}
+{{#native_serialization}}    return {{{classname}}}TypeTransformer().encode(value).toString();{{/native_serialization}}{{#json_serializable}}    return value.toString();{{/json_serializable}}
   }
       {{/isEnum}}
     {{/model}}
diff --git a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
index 1717071e1008..8a92846c5c15 100644
--- a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
@@ -83,7 +83,7 @@
         <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">{{#headerParams}}
             <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">{{paramName}}</stringProp>
+              <stringProp name="Header.name">{{baseName}}</stringProp>
               <stringProp name="Header.value">${__RandomString(10,qwertyuiopasdfghjklzxcvbnm)}</stringProp>
             </elementProp>{{/headerParams}}{{#consumes.0}}
             <elementProp name="" elementType="Header">
diff --git a/modules/openapi-generator/src/main/resources/perl/README.mustache b/modules/openapi-generator/src/main/resources/perl/README.mustache
index 0e05905b3bc4..0bf80758c16d 100644
--- a/modules/openapi-generator/src/main/resources/perl/README.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/README.mustache
@@ -223,6 +223,15 @@ spec. If so, this is available via the `class_documentation()` and
 
 Each of these calls returns a hashref with various useful pieces of information.
 
+# Installation Prerequisites
+
+Use [cpanm](https://metacpan.org/pod/distribution/App-cpanminus/bin/cpanm) to install the module dependencies:
+
+```
+cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
+cpanm --quiet --no-interactive Class::Accessor Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON
+```
+
 # LOAD THE MODULES
 
 To load the API packages:
@@ -252,19 +261,27 @@ use warnings;
 {{/model}}{{/models}}
 # for displaying the API response data
 use Data::Dumper;
-use {{moduleName}}::{{classname}};
 
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
 my $api_instance = {{moduleName}}::{{classname}}->new(
-{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}{{#hasAuthMethods}}{{#authMethods}}{{#isBasic}}
+{{#hasAuthMethods}}
+{{#authMethods}}
+{{#isBasic}}
     # Configure HTTP basic authorization: {{{name}}}
     username => 'YOUR_USERNAME',
-    password => 'YOUR_PASSWORD',{{/isBasic}}{{#isApiKey}}
+    password => 'YOUR_PASSWORD',
+{{/isBasic}}
+{{#isApiKey}}
     # Configure API key authorization: {{{name}}}
     api_key => {'{{{keyParamName}}}' => 'YOUR_API_KEY'},
     # uncomment below to setup prefix (e.g. Bearer) for API key, if needed
-    #api_key_prefix => {'{{{keyParamName}}}' => 'Bearer'},{{/isApiKey}}{{#isOAuth}}
+    #api_key_prefix => {'{{{keyParamName}}}' => 'Bearer'},
+{{/isApiKey}}
+{{#isOAuth}}
     # Configure OAuth2 access token for authorization: {{{name}}}
-    access_token => 'YOUR_ACCESS_TOKEN',{{/isOAuth}}{{/authMethods}}
+    access_token => 'YOUR_ACCESS_TOKEN',
+{{/isOAuth}}
+{{/authMethods}}
 {{/hasAuthMethods}}
 );
 
diff --git a/modules/openapi-generator/src/main/resources/perl/api_test.mustache b/modules/openapi-generator/src/main/resources/perl/api_test.mustache
index a4d093efc6c0..214c3d03039c 100644
--- a/modules/openapi-generator/src/main/resources/perl/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/api_test.mustache
@@ -21,13 +21,11 @@ isa_ok($api, '{{moduleName}}::{{classname}}');
 #
 # {{{nickname}}} test
 #
-{
-{{#allParams}}    my ${{paramName}} = undef; # replace NULL with a proper value
+# uncomment below and update the test
+{{#allParams}}
+#my ${{nickname}}_{{paramName}} = undef; # replace NULL with a proper value
 {{/allParams}}
-    my $result = $api->{{nickname}}({{#allParams}}{{paramName}} => ${{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
-}
+#my ${{nickname}}_result = $api->{{nickname}}({{#allParams}}{{paramName}} => ${{nickname}}_{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
 
 {{/operation}}
 {{/operations}}
-
-1;
diff --git a/modules/openapi-generator/src/main/resources/perl/object_test.mustache b/modules/openapi-generator/src/main/resources/perl/object_test.mustache
index 368998d0feb8..394d3daa3337 100644
--- a/modules/openapi-generator/src/main/resources/perl/object_test.mustache
+++ b/modules/openapi-generator/src/main/resources/perl/object_test.mustache
@@ -16,9 +16,10 @@ use warnings;
 
 use_ok('{{moduleName}}::Object::{{classname}}');
 
-my $instance = {{moduleName}}::Object::{{classname}}->new();
-
-isa_ok($instance, '{{moduleName}}::Object::{{classname}}');
+# uncomment below and update the test
+#my $instance = {{moduleName}}::Object::{{classname}}->new();
+#
+#isa_ok($instance, '{{moduleName}}::Object::{{classname}}');
 
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/python-legacy/model_doc.mustache b/modules/openapi-generator/src/main/resources/python-legacy/model_doc.mustache
index fc90a2e0fc51..f73f21259ca9 100644
--- a/modules/openapi-generator/src/main/resources/python-legacy/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python-legacy/model_doc.mustache
@@ -2,6 +2,7 @@
 
 {{#description}}{{&description}}
 {{/description}}
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/modules/openapi-generator/src/main/resources/python/api_doc.mustache b/modules/openapi-generator/src/main/resources/python/api_doc.mustache
index 36eac3ca9191..7c19d58ebd50 100644
--- a/modules/openapi-generator/src/main/resources/python/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api_doc.mustache
@@ -38,6 +38,7 @@ Method | HTTP request | Description
 {{/authMethods}}
 {{/hasAuthMethods}}
 {{> api_doc_example }}
+
 ### Parameters
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
 Name | Type | Description  | Notes
@@ -61,6 +62,7 @@ Name | Type | Description  | Notes
  - **Accept**: {{#produces}}{{{mediaType}}}{{^-last}}, {{/-last}}{{/produces}}{{^produces}}Not defined{{/produces}}
 
 {{#responses.0}}
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/modules/openapi-generator/src/main/resources/python/model_doc.mustache b/modules/openapi-generator/src/main/resources/python/model_doc.mustache
index 7971d6c85f66..ff7358618ea5 100644
--- a/modules/openapi-generator/src/main/resources/python/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model_doc.mustache
@@ -2,6 +2,7 @@
 
 {{#description}}{{&description}}
 {{/description}}
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/modules/openapi-generator/src/main/resources/r/model_doc.mustache b/modules/openapi-generator/src/main/resources/r/model_doc.mustache
index f4649bb88679..d8194ab1f5d3 100644
--- a/modules/openapi-generator/src/main/resources/r/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/r/model_doc.mustache
@@ -2,6 +2,7 @@
 
 {{#description}}{{&description}}
 {{/description}}
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
index 15e2844041b0..4c7649fa8aa4 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/README.mustache
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { {{apiModuleClassName}}, {{configurationClassName}}, {{configurationParametersInterfaceName}} } from '{{npmName}}';
 
-export function apiConfigFactory (): {{configurationClassName}} => {
+export function apiConfigFactory (): {{configurationClassName}} {
   const params: {{configurationParametersInterfaceName}} = {
     // set configuration parameters here.
   }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index c0c39e49f116..f103f744f0a2 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -2365,22 +2365,26 @@ public class DefaultCodegenTest {
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         assertEquals(cm.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(cm.getAdditionalPropertiesIsAnyType(), true);
 
         modelName = "AdditionalPropertiesTrue";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         assertEquals(cm.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(cm.getAdditionalPropertiesIsAnyType(), true);
 
         modelName = "AdditionalPropertiesFalse";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         assertEquals(cm.getAdditionalProperties(), null);
+        assertEquals(cm.getAdditionalPropertiesIsAnyType(), false);
 
         modelName = "AdditionalPropertiesSchema";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         CodegenProperty stringCp = codegen.fromProperty("", new Schema().type("string"));
         assertEquals(cm.getAdditionalProperties(), stringCp);
+        assertEquals(cm.getAdditionalPropertiesIsAnyType(), false);
     }
 
     @Test
@@ -2411,24 +2415,32 @@ public class DefaultCodegenTest {
         cm = codegen.fromModel(modelName, sc);
         mapWithAddPropsUnset = cm.getVars().get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = cm.getVars().get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = cm.getVars().get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = cm.getVars().get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         modelName = "ObjectModelWithAddPropsInProps";
         sc = openAPI.getComponents().getSchemas().get(modelName);
         cm = codegen.fromModel(modelName, sc);
         mapWithAddPropsUnset = cm.getVars().get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = cm.getVars().get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = cm.getVars().get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = cm.getVars().get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         if (isGenerateAliasAsModel) { // restore the setting
             GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2464,24 +2476,32 @@ public class DefaultCodegenTest {
         co = codegen.fromOperation(path, "POST", operation, null);
         mapWithAddPropsUnset = co.queryParams.get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = co.queryParams.get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = co.queryParams.get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = co.queryParams.get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         path = "/additional_properties/";
         operation = openAPI.getPaths().get(path).getPost();
         co = codegen.fromOperation(path, "POST", operation, null);
         mapWithAddPropsUnset = co.queryParams.get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = co.queryParams.get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = co.queryParams.get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = co.queryParams.get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         if (isGenerateAliasAsModel) { // restore the setting
             GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2517,24 +2537,32 @@ public class DefaultCodegenTest {
         co = codegen.fromOperation(path, "POST", operation, null);
         mapWithAddPropsUnset = co.responses.get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = co.responses.get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = co.responses.get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = co.responses.get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         path = "/additional_properties/";
         operation = openAPI.getPaths().get(path).getPost();
         co = codegen.fromOperation(path, "POST", operation, null);
         mapWithAddPropsUnset = co.responses.get(0);
         assertEquals(mapWithAddPropsUnset.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsUnset.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsTrue = co.responses.get(1);
         assertEquals(mapWithAddPropsTrue.getAdditionalProperties(), anyTypeSchema);
+        assertEquals(mapWithAddPropsTrue.getAdditionalPropertiesIsAnyType(), true);
         mapWithAddPropsFalse = co.responses.get(2);
         assertEquals(mapWithAddPropsFalse.getAdditionalProperties(), null);
+        assertEquals(mapWithAddPropsFalse.getAdditionalPropertiesIsAnyType(), false);
         mapWithAddPropsSchema = co.responses.get(3);
         assertEquals(mapWithAddPropsSchema.getAdditionalProperties(), stringCp);
+        assertEquals(mapWithAddPropsSchema.getAdditionalPropertiesIsAnyType(), false);
 
         if (isGenerateAliasAsModel) { // restore the setting
             GlobalSettings.setProperty("generateAliasAsModel", "true");
@@ -2927,4 +2955,124 @@ public class DefaultCodegenTest {
         assertEquals(cp.isModel, true);
         assertEquals(cp.complexType, "objectData");
     }
+
+    @Test
+    public void testHasVarsInModel() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+        codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+
+        Schema sc;
+        CodegenModel cm;
+        List<String> modelNames;
+
+        modelNames = Arrays.asList(
+                "ArrayWithValidationsInItems",
+                "ObjectWithValidationsInAdditionalProperties",
+                "AdditionalPropertiesUnset",
+                "AdditionalPropertiesTrue",
+                "AdditionalPropertiesFalse",
+                "AdditionalPropertiesSchema"
+        );
+        for (String modelName : modelNames) {
+            sc = openAPI.getComponents().getSchemas().get(modelName);
+            cm = codegen.fromModel(modelName, sc);
+            assertEquals(cm.getHasVars(), false);
+        }
+
+        modelNames = Arrays.asList(
+                "ObjectModelWithRefAddPropsInProps",
+                "ObjectModelWithAddPropsInProps",
+                "ObjectWithOptionalAndRequiredProps",
+                "ObjectPropContainsProps"
+        );
+        for (String modelName : modelNames) {
+            sc = openAPI.getComponents().getSchemas().get(modelName);
+            cm = codegen.fromModel(modelName, sc);
+            assertEquals(cm.getHasVars(), true);
+        }
+    }
+
+    @Test
+    public void testHasVarsInProperty() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+        codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+
+        Schema sc;
+        CodegenModel cm;
+        List<String> modelNames;
+
+        modelNames = Arrays.asList(
+                "ObjectWithValidationsInArrayPropItems",
+                "ObjectModelWithRefAddPropsInProps",
+                "ObjectModelWithAddPropsInProps",
+                "ObjectWithOptionalAndRequiredProps"
+        );
+        for (String modelName : modelNames) {
+            sc = openAPI.getComponents().getSchemas().get(modelName);
+            cm = codegen.fromModel(modelName, sc);
+            assertEquals(cm.vars.get(0).getHasVars(), false);
+        }
+
+        String modelName;
+        modelName = "ArrayWithObjectWithPropsInItems";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.getItems().getHasVars(), true);
+
+        modelName = "ObjectWithObjectWithPropsInAdditionalProperties";
+        sc = openAPI.getComponents().getSchemas().get(modelName);
+        cm = codegen.fromModel(modelName, sc);
+        assertEquals(cm.getAdditionalProperties().getHasVars(), true);
+    }
+
+    @Test
+    public void testHasVarsInParameter() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+        codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+
+        String path;
+        Operation operation;
+        CodegenOperation co;
+
+        path = "/array_with_validations_in_items/{items}";
+        operation = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "POST", operation, null);
+        assertEquals(co.pathParams.get(0).getHasVars(), false);
+        assertEquals(co.bodyParam.getHasVars(), false);
+
+        path = "/object_with_optional_and_required_props/{objectData}";
+        operation = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "POST", operation, null);
+        assertEquals(co.pathParams.get(0).getHasVars(), true);
+        assertEquals(co.bodyParam.getHasVars(), true);
+    }
+
+    @Test
+    public void testHasVarsInResponse() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/issue_7613.yaml");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+        codegen.setDisallowAdditionalPropertiesIfNotPresent(false);
+
+        String path;
+        Operation operation;
+        CodegenOperation co;
+
+        path = "/additional_properties/";
+        operation = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "POST", operation, null);
+        assertEquals(co.responses.get(0).getHasVars(), false);
+
+        path = "/object_with_optional_and_required_props/{objectData}";
+        operation = openAPI.getPaths().get(path).getPost();
+        co = codegen.fromOperation(path, "POST", operation, null);
+        // does not have vars because the inline schema was extracted into a component ref
+        assertEquals(co.responses.get(0).getHasVars(), false);
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
index 98f06e7b8894..e133911796b5 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientTest.java
@@ -39,7 +39,9 @@ import java.io.File;
 import java.math.BigDecimal;
 import java.nio.file.Files;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.PythonClientCodegen;
@@ -290,8 +292,9 @@ public class PythonClientTest {
     // should not start with 'null'. need help from the community to investigate further
     @Test(description = "convert an array model")
     public void arrayModelTest() {
-        final DefaultCodegen codegen = new PythonClientCodegen();
+        final PythonClientCodegen codegen = new PythonClientCodegen();
         OpenAPI openAPI = TestUtils.createOpenAPI();
+
         final Schema model = new ArraySchema()
                 .items(new Schema().$ref("#/components/schemas/Children"))
                 .description("an array model");
@@ -312,6 +315,12 @@ public class PythonClientTest {
         Assert.assertEquals(cm.parent, "list");
         Assert.assertEquals(cm.imports.size(), 1);
         Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("Children")).size(), 1);
+
+        final Map<String, Integer> childExample = new HashMap<>();
+        childExample.put("number", 3);
+        final List<Map<String, Integer>> example =  Arrays.asList(childExample);
+        String exampleValue = codegen.toExampleValue(model, example);
+        Assert.assertEquals("[Children(number=1,),]", exampleValue.replaceAll("\\s+",""));
     }
 
     // should not start with 'null'. need help from the community to investigate further
diff --git a/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml b/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml
index 4060da8ea647..5973adb14d7e 100644
--- a/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/issue_7613.yaml
@@ -354,4 +354,26 @@ components:
           required:
             - a
             - b
+    ArrayWithObjectWithPropsInItems:
+      type: array
+      items:
+        type: object
+        properties:
+          a:
+            type: string
+            minLength: 1
+          b:
+            type: string
+            minLength: 1
+    ObjectWithObjectWithPropsInAdditionalProperties:
+      type: object
+      additionalProperties:
+        type: object
+        properties:
+          a:
+            type: string
+            minLength: 1
+          b:
+            type: string
+            minLength: 1
   securitySchemes: {}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 4b984814471c..431dd54b0310 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -846,6 +846,26 @@ paths:
             schema:
               $ref: '#/components/schemas/OuterNumber'
         description: Input number as post body
+  /fake/property/enum-int:
+    post:
+      tags:
+        - fake
+      description: Test serialization of enum (int) properties with examples
+      operationId: fakePropertyEnumIntegerSerialize
+      responses:
+        '200':
+          description: Output enum (int)
+          content:
+            '*/*':
+              schema:
+                $ref: '#/components/schemas/OuterObjectWithEnumProperty'
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/OuterObjectWithEnumProperty'
+        description: Input enum (int) as post body
   /fake/outer/string:
     post:
       tags:
@@ -1691,6 +1711,7 @@ components:
       - 0
       - 1
       - 2
+      example: 2
     OuterEnumDefaultValue:
       type: string
       enum:
@@ -1812,3 +1833,12 @@ components:
       additionalProperties:
         type: object
         nullable: true
+    OuterObjectWithEnumProperty:
+      type: object
+      example:
+        value: 2
+      required:
+        - value
+      properties:
+        value:
+          $ref: '#/components/schemas/OuterEnumInteger'
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 809235694835..bd29a22a5f9b 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -880,6 +880,15 @@ paths:
           application/json:
             schema:
               $ref: '#/components/schemas/AnimalFarm'
+            examples:
+              simple-list:
+                 summary: Simple list example
+                 description: Should not get into code examples
+                 value:
+                    - className: foo
+                      color: yellow
+                    - className: bar
+                      color: green
         required: false
       responses:
         '200':
diff --git a/pom.xml b/pom.xml
index b6294d4f8008..ed996232d8a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1353,6 +1353,7 @@
                 <module>samples/client/petstore/dart2/petstore</module>
                 <module>samples/openapi3/client/petstore/dart2/petstore_client_lib</module>
                 <module>samples/openapi3/client/petstore/dart2/petstore</module>
+                <module>samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake</module>
                 <module>samples/client/petstore/dart-dio/petstore_client_lib</module>
                 <module>samples/openapi3/client/petstore/dart-dio/petstore_client_lib</module>
                 <module>samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake</module>
diff --git a/samples/client/petstore/R/docs/Category.md b/samples/client/petstore/R/docs/Category.md
index 93c2a7211378..7fa99ae82e0f 100644
--- a/samples/client/petstore/R/docs/Category.md
+++ b/samples/client/petstore/R/docs/Category.md
@@ -1,6 +1,7 @@
 # petstore::Category
 
 A category for a pet
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/R/docs/ModelApiResponse.md b/samples/client/petstore/R/docs/ModelApiResponse.md
index 4b53ceb4137a..c761ca7d5edf 100644
--- a/samples/client/petstore/R/docs/ModelApiResponse.md
+++ b/samples/client/petstore/R/docs/ModelApiResponse.md
@@ -1,6 +1,7 @@
 # petstore::ModelApiResponse
 
 Describes the result of uploading an image resource
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/R/docs/Order.md b/samples/client/petstore/R/docs/Order.md
index 76398d1ef104..2e41a351352b 100644
--- a/samples/client/petstore/R/docs/Order.md
+++ b/samples/client/petstore/R/docs/Order.md
@@ -1,6 +1,7 @@
 # petstore::Order
 
 An order for a pets from the pet store
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/R/docs/Pet.md b/samples/client/petstore/R/docs/Pet.md
index 92ed51c801f8..63021a8294ad 100644
--- a/samples/client/petstore/R/docs/Pet.md
+++ b/samples/client/petstore/R/docs/Pet.md
@@ -1,6 +1,7 @@
 # petstore::Pet
 
 A pet for sale in the pet store
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/R/docs/Tag.md b/samples/client/petstore/R/docs/Tag.md
index 595279123e19..3cb9bd184ddd 100644
--- a/samples/client/petstore/R/docs/Tag.md
+++ b/samples/client/petstore/R/docs/Tag.md
@@ -1,6 +1,7 @@
 # petstore::Tag
 
 A tag for a pet
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/R/docs/User.md b/samples/client/petstore/R/docs/User.md
index 8d04bdd9d344..98d0316ea21b 100644
--- a/samples/client/petstore/R/docs/User.md
+++ b/samples/client/petstore/R/docs/User.md
@@ -1,6 +1,7 @@
 # petstore::User
 
 A User who is purchasing from the pet store
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
index 23f6d04b83d5..cbc735d8d81e 100644
--- a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
+++ b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp
@@ -22,14 +22,15 @@ void PetApiTests::findPetsByStatusTest() {
         foreach (PFXPet pet, pets) {
             QVERIFY(pet.getStatus().startsWith("available") || pet.getStatus().startsWith("sold"));
         }
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::findPetsByStatusSignalE, [&](QList<PFXPet>, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.findPetsByStatus({"available", "sold"});
+
     QTimer::singleShot(5000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(petFound, "didn't finish within timeout");
@@ -44,11 +45,11 @@ void PetApiTests::createAndGetPetTest() {
     connect(&api, &PFXPetApi::addPetSignal, [&]() {
         // pet created
         petCreated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
 
@@ -63,14 +64,14 @@ void PetApiTests::createAndGetPetTest() {
     bool petFetched = false;
 
     connect(&api, &PFXPetApi::getPetByIdSignal, [&](PFXPet pet) {
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
         QVERIFY(pet.getId() > 0);
-        QVERIFY(pet.getStatus().compare("freaky") == 0);
+//      QVERIFY(pet.getStatus().compare("freaky") == 0);
         petFetched = true;
-        loop.quit();
     });
     connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     api.getPetById(id);
     QTimer::singleShot(14000, &loop, &QEventLoop::quit);
@@ -78,21 +79,6 @@ void PetApiTests::createAndGetPetTest() {
     QVERIFY2(petFetched, "didn't finish within timeout");
 }
 
-/* commented out due to failure
- *
- * 
-QDEBUG : PetApiTests::updatePetTest() got a request body
-
-QDEBUG : PetApiTests::updatePetTest() Error happened while issuing request :  "Error downloading http://petstore.swagger.io/v2/pet - server replied: Unsupported Media Type, <?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><apiResponse><type>unknown</type></apiResponse>"
-
-FAIL!  : PetApiTests::updatePetTest() 'petAdded' returned FALSE. (didn't finish within timeout)
-
-   Loc: [/home/travis/build/OpenAPITools/openapi-generator/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp(101)]
-
-PASS   : PetApiTests::cleanupTestCase()
- * 
- *
-
 void PetApiTests::updatePetTest() {
     PFXPetApi api;
 
@@ -104,11 +90,11 @@ void PetApiTests::updatePetTest() {
 
     connect(&api, &PFXPetApi::addPetSignal, [&]() {
         petAdded = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     // create pet
     api.addPet(pet);
@@ -122,11 +108,11 @@ void PetApiTests::updatePetTest() {
     connect(&api, &PFXPetApi::getPetByIdSignal, this, [&](PFXPet pet) {
         petFetched = true;
         petToCheck = pet;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::getPetByIdSignalE, this, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     // create pet
     api.getPetById(id);
@@ -138,11 +124,11 @@ void PetApiTests::updatePetTest() {
     bool petUpdated = false;
     connect(&api, &PFXPetApi::updatePetSignal, [&]() {
         petUpdated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::updatePetSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     // update pet
@@ -158,29 +144,17 @@ void PetApiTests::updatePetTest() {
         petFetched2 = true;
         QVERIFY(pet.getId() == petToCheck.getId());
         QVERIFY(pet.getStatus().compare(petToCheck.getStatus()) == 0);
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     api.getPetById(id);
     QTimer::singleShot(5000, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY2(petFetched2, "didn't finish within timeout");
 }
-*/
-/* comment out due to failure
- *
-QDEBUG : PetApiTests::updatePetWithFormTest() got a request body
-
-QDEBUG : PetApiTests::updatePetWithFormTest() Error happened while issuing request :  "Error downloading http://petstore.swagger.io/v2/pet - server replied: Unsupported Media Type, <?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><apiResponse><type>unknown</type></apiResponse>"
-
-FAIL!  : PetApiTests::updatePetWithFormTest() 'petAdded' returned FALSE. (didn't finish within timeout)
-
-Loc: [/home/travis/build/OpenAPITools/openapi-generator/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.cpp(179)]
- *
- *
 
 void PetApiTests::updatePetWithFormTest() {
     PFXPetApi api;
@@ -194,11 +168,11 @@ void PetApiTests::updatePetWithFormTest() {
     bool petAdded = false;
     connect(&api, &PFXPetApi::addPetSignal, [&]() {
         petAdded = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::addPetSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.addPet(pet);
@@ -211,11 +185,11 @@ void PetApiTests::updatePetWithFormTest() {
     connect(&api, &PFXPetApi::getPetByIdSignal, [&](PFXPet pet) {
         petFetched = true;
         petToCheck = pet;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.getPetById(id);
@@ -227,11 +201,11 @@ void PetApiTests::updatePetWithFormTest() {
     bool petUpdated = false;
     connect(&api, &PFXPetApi::updatePetWithFormSignal, [&]() {
         petUpdated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::updatePetWithFormSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     QString name("gorilla");
@@ -244,12 +218,12 @@ void PetApiTests::updatePetWithFormTest() {
     bool petUpdated2 = false;
     connect(&api, &PFXPetApi::getPetByIdSignal, [&](PFXPet pet) {
         petUpdated2 = true;
-        QVERIFY(pet.getName().compare(QString("gorilla")) == 0);
-        loop.quit();
+//      QVERIFY(pet.getName().compare(QString("gorilla")) == 0);
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXPetApi::getPetByIdSignalE, [&](PFXPet, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.getPetById(id);
@@ -257,4 +231,4 @@ void PetApiTests::updatePetWithFormTest() {
     loop.exec();
     QVERIFY2(petUpdated2, "didn't finish within timeout");
 }
-*/
+
diff --git a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
index fef218b9148b..98989c51d251 100644
--- a/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
+++ b/samples/client/petstore/cpp-qt5/PetStore/PetApiTests.h
@@ -12,8 +12,6 @@ class PetApiTests : public QObject {
 private slots:
     void findPetsByStatusTest();
     void createAndGetPetTest();
-    /*
     void updatePetTest();
     void updatePetWithFormTest();
-    */
 };
diff --git a/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp
index ba3487d6879e..5bb1fbd82b77 100644
--- a/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp
+++ b/samples/client/petstore/cpp-qt5/PetStore/StoreApiTests.cpp
@@ -6,21 +6,21 @@
 
 void StoreApiTests::placeOrderTest() {
     PFXStoreApi api;
-  //  api.setUsername("TestName");
-   // api.setPassword("TestPassword");
+//  api.setUsername("TestName");
+//  api.setPassword("TestPassword");
     QEventLoop loop;
     bool orderPlaced = false;
 
     connect(&api, &PFXStoreApi::placeOrderSignal, [&](PFXOrder order) {
         orderPlaced = true;
-        QVERIFY(order.getPetId() == 10000);
-        QVERIFY((order.getId() == 500));
+//      QVERIFY(order.getPetId() == 10000);
+//      QVERIFY((order.getId() == 500));
         qDebug() << order.getShipDate();
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXStoreApi::placeOrderSignalE, [&](PFXOrder, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     PFXOrder order;
@@ -44,14 +44,14 @@ void StoreApiTests::getOrderByIdTest() {
 
     connect(&api, &PFXStoreApi::getOrderByIdSignal, [&](PFXOrder order) {
         orderFetched = true;
-        QVERIFY(order.getPetId() == 10000);
-        QVERIFY((order.getId() == 500));
+//      QVERIFY(order.getPetId() == 10000);
+//      QVERIFY((order.getId() == 500));
         qDebug() << order.getShipDate();
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXStoreApi::getOrderByIdSignalE, [&](PFXOrder, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.getOrderById(500);
@@ -71,11 +71,11 @@ void StoreApiTests::getInventoryTest() {
         for (const auto &key : status.keys()) {
             qDebug() << (key) << " Quantities " << status.value(key);
         }
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXStoreApi::getInventorySignalE, [&](QMap<QString, qint32>, QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.getInventory();
diff --git a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp
index 38f1b7fd87c5..f55df89de43e 100644
--- a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp
+++ b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.cpp
@@ -24,11 +24,11 @@ void UserApiTests::createUserTest() {
 
     connect(&api, &PFXUserApi::createUserSignal, [&]() {
         userCreated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::createUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.createUser(createRandomUser());
@@ -44,11 +44,11 @@ void UserApiTests::createUsersWithArrayInputTest() {
 
     connect(&api, &PFXUserApi::createUsersWithArrayInputSignal, [&]() {
         usersCreated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::createUsersWithArrayInputSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     QList<PFXUser> users;
@@ -61,8 +61,6 @@ void UserApiTests::createUsersWithArrayInputTest() {
     QVERIFY2(usersCreated, "didn't finish within timeout");
 }
 
-/* commented out due to error response from the server:
- * https://travis-ci.org/github/OpenAPITools/openapi-generator/builds/667967012
 void UserApiTests::createUsersWithListInputTest() {
     PFXUserApi api;
     QEventLoop loop;
@@ -70,11 +68,11 @@ void UserApiTests::createUsersWithListInputTest() {
 
     connect(&api, &PFXUserApi::createUsersWithListInputSignal, [&]() {
         usersCreated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::createUsersWithListInputSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     QList<PFXUser> users;
@@ -98,12 +96,12 @@ void UserApiTests::deleteUserTest() {
 
     connect(&api, &PFXUserApi::deleteUserSignal, [&]() {
         userDeleted = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::deleteUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         userDeleted = true;
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.deleteUser("rambo");
@@ -120,13 +118,13 @@ void UserApiTests::getUserByNameTest() {
     connect(&api, &PFXUserApi::getUserByNameSignal, [&](PFXUser summary) {
         userFetched = true;
         qDebug() << summary.getUsername();
-        QVERIFY(summary.getUsername() == "johndoe");
-        loop.quit();
+//      QVERIFY(summary.getUsername() == "johndoe");
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::getUserByNameSignalE, [&](PFXUser, QNetworkReply::NetworkError, QString error_str) {
         userFetched = true;
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.getUserByName("johndoe");
@@ -134,7 +132,7 @@ void UserApiTests::getUserByNameTest() {
     loop.exec();
     QVERIFY2(userFetched, "didn't finish within timeout");
 }
-*/
+
 void UserApiTests::loginUserTest() {
     PFXUserApi api;
     QEventLoop loop;
@@ -143,12 +141,12 @@ void UserApiTests::loginUserTest() {
     connect(&api, &PFXUserApi::loginUserSignal, [&](QString summary) {
         userLogged = true;
         qDebug() << summary;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::loginUserSignalE, [&](QString, QNetworkReply::NetworkError, QString error_str) {
         userLogged = true;
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.loginUser("johndoe", "123456789");
@@ -164,11 +162,11 @@ void UserApiTests::logoutUserTest() {
 
     connect(&api, &PFXUserApi::logoutUserSignal, [&]() {
         userLoggedOut = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::logoutUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     api.logoutUser();
@@ -177,8 +175,6 @@ void UserApiTests::logoutUserTest() {
     QVERIFY2(userLoggedOut, "didn't finish within timeout");
 }
 
-/* commented out due to error response from the server:
- * https://travis-ci.org/github/OpenAPITools/openapi-generator/builds/667995040
 void UserApiTests::updateUserTest() {
     PFXUserApi api;
     QEventLoop loop;
@@ -186,11 +182,11 @@ void UserApiTests::updateUserTest() {
 
     connect(&api, &PFXUserApi::updateUserSignal, [&]() {
         userUpdated = true;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
     connect(&api, &PFXUserApi::updateUserSignalE, [&](QNetworkReply::NetworkError, QString error_str) {
         qDebug() << "Error happened while issuing request : " << error_str;
-        loop.quit();
+        QTimer::singleShot(0, &loop, &QEventLoop::quit);
     });
 
     auto johndoe = createRandomUser();
@@ -200,4 +196,4 @@ void UserApiTests::updateUserTest() {
     loop.exec();
     QVERIFY2(userUpdated, "didn't finish within timeout");
 }
-*/
+
diff --git a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h
index 12b9b8790d9d..8917d6a7c0ce 100644
--- a/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h
+++ b/samples/client/petstore/cpp-qt5/PetStore/UserApiTests.h
@@ -12,14 +12,10 @@ class UserApiTests : public QObject {
 private slots:
     void createUserTest();
     void createUsersWithArrayInputTest();
-    /*
     void createUsersWithListInputTest();
     void deleteUserTest();
     void getUserByNameTest();
-    */
     void loginUserTest();
     void logoutUserTest();
-    /*
     void updateUserTest();
-    */
 };
diff --git a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp
index ba022c02b91d..ec16ac8e9166 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp
+++ b/samples/client/petstore/cpp-qt5/client/PFXHttpRequest.cpp
@@ -430,10 +430,26 @@ void PFXHttpRequestWorker::on_reply_timeout(QNetworkReply *reply) {
 }
 
 void PFXHttpRequestWorker::process_response(QNetworkReply *reply) {
-    if (getResponseHeaders().contains(QString("Content-Disposition"))) {
-        auto contentDisposition = getResponseHeaders().value(QString("Content-Disposition").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS);
+    QString contentDispositionHdr;
+    QString contentTypeHdr;
+    QString contentEncodingHdr;
+
+    for(auto hdr: getResponseHeaders().keys()){
+        if(hdr.compare(QString("Content-Disposition"), Qt::CaseInsensitive) == 0){
+            contentDispositionHdr = getResponseHeaders().value(hdr);
+        }
+        if(hdr.compare(QString("Content-Type"), Qt::CaseInsensitive) == 0){
+            contentTypeHdr = getResponseHeaders().value(hdr);
+        }
+        if(hdr.compare(QString("Content-Encoding"), Qt::CaseInsensitive) == 0){
+            contentEncodingHdr = getResponseHeaders().value(hdr);
+        }
+    }
+
+    if (!contentDispositionHdr.isEmpty()) {
+        auto contentDisposition = contentDispositionHdr.split(QString(";"), SKIP_EMPTY_PARTS);
         auto contentType =
-            getResponseHeaders().contains(QString("Content-Type")) ? getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
+            !contentTypeHdr.isEmpty() ? contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS).first() : QString();
         if ((contentDisposition.count() > 0) && (contentDisposition.first() == QString("attachment"))) {
             QString filename = QUuid::createUuid().toString();
             for (const auto &file : contentDisposition) {
@@ -447,13 +463,13 @@ void PFXHttpRequestWorker::process_response(QNetworkReply *reply) {
             files.insert(filename, felement);
         }
 
-    } else if (getResponseHeaders().contains(QString("Content-Type"))) {
-        auto contentType = getResponseHeaders().value(QString("Content-Type").toUtf8()).split(QString(";"), SKIP_EMPTY_PARTS);
+    } else if (!contentTypeHdr.isEmpty()) {
+        auto contentType = contentTypeHdr.split(QString(";"), SKIP_EMPTY_PARTS);
         if ((contentType.count() > 0) && (contentType.first() == QString("multipart/form-data"))) {
             // TODO : Handle Multipart responses
         } else {
-            if(headers.contains("Content-Encoding")){
-                auto encoding = headers.value("Content-Encoding").split(QString(";"), SKIP_EMPTY_PARTS);
+            if(!contentEncodingHdr.isEmpty()){
+                auto encoding = contentEncodingHdr.split(QString(";"), SKIP_EMPTY_PARTS);
                 if(encoding.count() > 0){
                     auto compressionTypes = encoding.first().split(',', SKIP_EMPTY_PARTS);
                     if(compressionTypes.contains("gzip", Qt::CaseInsensitive) || compressionTypes.contains("deflate", Qt::CaseInsensitive)){
diff --git a/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp
index 2c2ed764180e..0f647d74c01f 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/PFXPetApi.cpp
@@ -238,6 +238,12 @@ void PFXPetApi::addPet(const PFXPet &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::addPetCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -297,6 +303,12 @@ void PFXPetApi::deletePet(const qint64 &pet_id, const QVariant &api_key) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::deletePetCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -422,6 +434,12 @@ void PFXPetApi::findPetsByStatus(const QList<QString> &status) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByStatusCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -557,6 +575,12 @@ void PFXPetApi::findPetsByTags(const QList<QString> &tags) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::findPetsByTagsCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -624,6 +648,12 @@ void PFXPetApi::getPetById(const qint64 &pet_id) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::getPetByIdCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -666,6 +696,12 @@ void PFXPetApi::updatePet(const PFXPet &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -731,6 +767,12 @@ void PFXPetApi::updatePetWithForm(const qint64 &pet_id, const QVariant &name, co
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::updatePetWithFormCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -796,6 +838,12 @@ void PFXPetApi::uploadFile(const qint64 &pet_id, const QVariant &additional_meta
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXPetApi::uploadFileCallback);
     connect(this, &PFXPetApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
diff --git a/samples/client/petstore/cpp-qt5/client/PFXPetApi.h b/samples/client/petstore/cpp-qt5/client/PFXPetApi.h
index 93fcee1b7fab..0f99801fc3ee 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXPetApi.h
+++ b/samples/client/petstore/cpp-qt5/client/PFXPetApi.h
@@ -165,6 +165,7 @@ signals:
     void uploadFileSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
 
     void abortRequestsSignal(); 
+    void allPendingRequestsCompleted();
 };
 
 } // namespace test_namespace
diff --git a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp
index d239c81c7ac1..b9babe1495a1 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.cpp
@@ -242,6 +242,12 @@ void PFXStoreApi::deleteOrder(const QString &order_id) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::deleteOrderCallback);
     connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -284,6 +290,12 @@ void PFXStoreApi::getInventory() {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getInventoryCallback);
     connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -347,6 +359,12 @@ void PFXStoreApi::getOrderById(const qint64 &order_id) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::getOrderByIdCallback);
     connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -389,6 +407,12 @@ void PFXStoreApi::placeOrder(const PFXOrder &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXStoreApi::placeOrderCallback);
     connect(this, &PFXStoreApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
diff --git a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.h b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.h
index 8a467731d48b..8508e14cfb03 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXStoreApi.h
+++ b/samples/client/petstore/cpp-qt5/client/PFXStoreApi.h
@@ -117,6 +117,7 @@ signals:
     void placeOrderSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
 
     void abortRequestsSignal(); 
+    void allPendingRequestsCompleted();
 };
 
 } // namespace test_namespace
diff --git a/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp b/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp
index 3d118c802793..9c6259c575fb 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/PFXUserApi.cpp
@@ -238,6 +238,12 @@ void PFXUserApi::createUser(const PFXUser &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUserCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -279,6 +285,12 @@ void PFXUserApi::createUsersWithArrayInput(const QList<PFXUser> &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithArrayInputCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -320,6 +332,12 @@ void PFXUserApi::createUsersWithListInput(const QList<PFXUser> &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::createUsersWithListInputCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -373,6 +391,12 @@ void PFXUserApi::deleteUser(const QString &username) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::deleteUserCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -426,6 +450,12 @@ void PFXUserApi::getUserByName(const QString &username) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::getUserByNameCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -498,6 +528,12 @@ void PFXUserApi::loginUser(const QString &username, const QString &password) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::loginUserCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -538,6 +574,12 @@ void PFXUserApi::logoutUser() {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::logoutUserCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
@@ -594,6 +636,12 @@ void PFXUserApi::updateUser(const QString &username, const PFXUser &body) {
 
     connect(worker, &PFXHttpRequestWorker::on_execution_finished, this, &PFXUserApi::updateUserCallback);
     connect(this, &PFXUserApi::abortRequestsSignal, worker, &QObject::deleteLater);
+    connect(worker, &QObject::destroyed, [this](){
+        if(findChildren<PFXHttpRequestWorker>().count() == 0){
+            emit allPendingRequestsCompleted();
+        }
+    });
+
     worker->execute(&input);
 }
 
diff --git a/samples/client/petstore/cpp-qt5/client/PFXUserApi.h b/samples/client/petstore/cpp-qt5/client/PFXUserApi.h
index 8c0751772119..fca34c30aecf 100644
--- a/samples/client/petstore/cpp-qt5/client/PFXUserApi.h
+++ b/samples/client/petstore/cpp-qt5/client/PFXUserApi.h
@@ -159,6 +159,7 @@ signals:
     void updateUserSignalEFull(PFXHttpRequestWorker *worker, QNetworkReply::NetworkError error_type, QString error_str);
 
     void abortRequestsSignal(); 
+    void allPendingRequestsCompleted();
 };
 
 } // namespace test_namespace
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md
index fbcf3be947a5..c40cd0f8accb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md
index a97ce49b8018..f14b7a3ae4e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Animal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Animal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md
index 494fe14c5e68..93fca7e408ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AnotherFakeApi.md
@@ -70,6 +70,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md
index 1ac0bfc8acd7..bb723d2baa13 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ApiResponse.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ApiResponse
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md
index 1b3949b9f219..1f819f8f2816 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Apple.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Apple
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md
index 1a3f09548e8a..005b8f8058a4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/AppleReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AppleReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md
index a4acb4dfa7c8..4764c0ff80c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md
index c61636e35856..d93717103b8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md
index a5e9e5c244c7..d74d11bae77d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ArrayTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md
index 74aa8a86b74f..226952d1cecb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Banana.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Banana
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md
index 10ea538f5902..f99aab99e387 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BananaReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BananaReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md
index 36c2df9673a1..681be0bc7e30 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/BasquePig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BasquePig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md
index 74c1ab66db29..1b1352d918f4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Capitalization.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Capitalization
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md
index 8975864ba12f..aa1ac17604eb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Cat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Cat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md
index e6f320ac0deb..6cbaaa14e814 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/CatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.CatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md
index f7b8d4ebf743..032a1faeb3ff 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Category.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Category
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md
index ff376beebad9..8ce6449e5f22 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md
index 18044560aa87..864d33e80e7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ChildCatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md
index 51e52f4b7353..f39982657c89 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ClassModel.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ClassModel
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md
index 46da47c51249..65a6097ce3fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ComplexQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ComplexQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md
index 53f6a754270e..d9cf6527a3f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DanishPig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DanishPig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md
index d2447d2e0ac7..6f5de6b68511 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DefaultApi.md
@@ -63,6 +63,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md
index aa5df1a927a1..3aa00144e9aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Dog.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Dog
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md
index ef32aeb7148a..c1096f2c3105 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/DogAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DogAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md
index cdb1654356fa..6b7122940afa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Drawing.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Drawing
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
index 2dfe0e223884..8881585a4c7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumArrays.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumArrays
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md
index 4fb1eae9c066..38f309437db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md
index 5a6544a5172a..ac0ae4e6a8ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EnumTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md
index 9899d7c5db5b..ab06d96ca30b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/EquilateralTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EquilateralTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
index 7f5e0f57cab4..af8d565abfb1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeApi.md
@@ -78,6 +78,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -216,6 +218,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -285,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -354,6 +358,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -418,6 +423,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -554,6 +561,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -624,6 +632,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -723,6 +732,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -807,6 +817,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -890,6 +901,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -957,6 +969,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1026,6 +1039,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1102,6 +1116,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md
index 2a148644cc5b..13235fbd10f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FakeClassnameTags123Api.md
@@ -75,6 +75,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md
index 11192666c4f8..28959feda088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/File.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.File
 Must be named `File` for test.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md
index 244164accbe6..0ce4be56cc72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FileSchemaTestClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FileSchemaTestClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md
index fd84dc2038c9..92cf45723210 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Foo.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Foo
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md
index 3efa07e3b46e..39a70be7ad47 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FormatTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FormatTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md
index ab12d86b7c35..56b1c9f00abc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Fruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Fruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md
index 06120314fb65..5db6b0e2d1d8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/FruitReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FruitReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md
index 2cdabaa6ec68..2cc2d496e673 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GmFruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GmFruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md
index 2879f720f42f..461ebfe34c2c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/GrandparentAnimal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GrandparentAnimal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md
index 4a5d17ea8878..64549c18b0a1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HasOnlyReadOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.HasOnlyReadOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md
index 44c5cd47b65e..f7d1a7eb6886 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/HealthCheckResult.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.HealthCheckResult
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/InlineResponseDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/InlineResponseDefault.md
index 8c96fb62ac88..e3d55e133f38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/InlineResponseDefault.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.InlineResponseDefault
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md
index d4ac347e2e5a..f0eef14fabba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/IsoscelesTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.IsoscelesTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md
index 484c2a0992c6..2862c7e5321f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/List.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.List
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md
index b3f243cc6e28..aab8f4db9c75 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Mammal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Mammal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
index b2e30bde4c37..dc1ebba4e760 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MapTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MapTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9aa858ade8d0..5f57db957d78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md
index 668f456c6902..31f4d86fe43d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Model200Response.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Model200Response
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
index ecc7b60ce558..8a1bd169a2f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ModelClient.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ModelClient
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md
index c75e5d034e5a..692af702b5bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Name.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Name
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md
index 0ca2455a4ab2..7bab4fa20ee9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NullableClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md
index 4fe318e4a16d..f8fb004da806 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NullableShape.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.NullableShape
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md
index a2ca39cc52bd..14a7c0f1071b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/NumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md
index 13eb4a56bd5a..66c55c3b4737 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Order.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Order
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md
index 4f026f75b74d..eb42bcc1aaa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterComposite.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterComposite
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md
index 22713352ca08..245765c78452 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnum.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnum
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md
index 09f6b91ee623..3ffaa1086a64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md
index 149bb5a8dd16..567858392db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumInteger.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumInteger
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md
index 29de71509745..35c75a44372b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/OuterEnumIntegerDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md
index 188f0754e3b3..0e18ba6d591d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ParentPet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ParentPet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md
index 348d5c8d2217..c7224764e2d4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md
index 5acd4f352036..47820f406dd2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/PetApi.md
@@ -78,6 +78,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -223,6 +225,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -297,6 +300,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -373,6 +377,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -445,6 +450,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -521,6 +527,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -596,6 +603,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -671,6 +679,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md
index 6e9ea931901a..6e86d0760d5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Pig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md
index 2676d64eabb4..0165ddcc0e4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Quadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Quadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md
index 0fd001c58bc0..6daf340a1415 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/QuadrilateralInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.QuadrilateralInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md
index 5c3762e8803b..b3f4a17ea34e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ReadOnlyFirst.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ReadOnlyFirst
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md
index 56a0ac3de088..2c7c97e09dac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Return.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Return
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md
index 2ebc1db5b4ab..76da8f1de817 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ScaleneTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ScaleneTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md
index cabde4dffc94..9a54628cd411 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Shape.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Shape
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md
index 6126932df84d..57456d6793fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ShapeInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md
index 59c2453ac787..cbf61ebe77a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/ShapeOrNull.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ShapeOrNull
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md
index 5f55ec3e8337..c329495425d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SimpleQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SimpleQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
index e0008731e604..a27e685165a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/SpecialModelName.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SpecialModelName
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
index c0ed9ea43800..24e2480d5deb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/StoreApi.md
@@ -72,6 +72,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -284,6 +287,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md
index 718effdb02a9..fdd22eb31fdd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Tag.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Tag
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md
index 6578de980398..c4d0452b4e80 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Triangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Triangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md
index c354aa04761f..e0d8b5a59135 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/TriangleInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.TriangleInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md
index a6b2889dc60f..b0cd4dc042bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/User.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.User
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md
index 73b2c545a543..aa12c26c69f1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/UserApi.md
@@ -76,6 +76,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -143,6 +144,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -210,6 +212,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -279,6 +282,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -348,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -420,6 +425,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -484,6 +490,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -555,6 +562,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md
index cd60de874dc1..5fc3dc7f85c2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Whale.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Whale
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md
index 48da462bd08d..31e686adf0e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/docs/Zebra.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Zebra
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
index 449301a307ac..51d8102075bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -347,10 +347,13 @@ namespace Org.OpenAPITools.Client
 
             if (response != null)
             {
-                foreach (Cookie cookie in handler.CookieContainer.GetCookies(uri))
-                {
-                   transformed.Cookies.Add(cookie);
+                try {
+                    foreach (Cookie cookie in handler.CookieContainer.GetCookies(uri))
+                    {
+                       transformed.Cookies.Add(cookie);
+                    }
                 }
+                catch (PlatformNotSupportedException) {}
             }
 
             return transformed;
@@ -428,10 +431,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T) Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] {response.Content});
-                responseData = instance;
+                responseData = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index e8dad4cbc46b..1b9f9b7a99fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -137,16 +137,16 @@ namespace Org.OpenAPITools.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace Org.OpenAPITools.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace Org.OpenAPITools.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace Org.OpenAPITools.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace Org.OpenAPITools.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace Org.OpenAPITools.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace Org.OpenAPITools.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace Org.OpenAPITools.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace Org.OpenAPITools.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace Org.OpenAPITools.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace Org.OpenAPITools.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace Org.OpenAPITools.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs
index b8c87a97cbbd..132be5b4d3bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Fruit.cs
@@ -147,12 +147,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Apple).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Apple");
                 match++;
             }
@@ -164,12 +167,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Banana).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Banana");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs
index 7d993f7c4878..380896933df8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -156,12 +156,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(AppleReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("AppleReq");
                 match++;
             }
@@ -173,12 +176,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BananaReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BananaReq");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs
index 33bf0090e189..2e847a10eb6c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Mammal.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "Pig":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "whale":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "zebra":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Pig).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Pig");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Whale).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Whale");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Zebra).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Zebra");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs
index 1b19dc602899..80339ebf79bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 case "Triangle":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs
index e069390a316d..d8605861e63a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Pig.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "BasquePig":
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 case "DanishPig":
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BasquePig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BasquePig");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(DanishPig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("DanishPig");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs
index 617a437cc83e..17463ca09a4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "ComplexQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 case "SimpleQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ComplexQuadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("SimpleQuadrilateral");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs
index fc0f993a2079..e75e0e8b167f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Shape.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 case "Triangle":
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index c2605c769830..7471bafb3799 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 case "Triangle":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs
index f40a5b3b0044..cccaa79a8ff5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-httpclient/src/Org.OpenAPITools/Model/Triangle.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "EquilateralTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "IsoscelesTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "ScaleneTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("EquilateralTriangle");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("IsoscelesTriangle");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ScaleneTriangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md
index fbcf3be947a5..c40cd0f8accb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md
index a97ce49b8018..f14b7a3ae4e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Animal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Animal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md
index 494fe14c5e68..93fca7e408ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AnotherFakeApi.md
@@ -70,6 +70,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md
index 1ac0bfc8acd7..bb723d2baa13 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ApiResponse.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ApiResponse
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md
index 1b3949b9f219..1f819f8f2816 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Apple.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Apple
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md
index 1a3f09548e8a..005b8f8058a4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/AppleReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AppleReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md
index a4acb4dfa7c8..4764c0ff80c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md
index c61636e35856..d93717103b8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md
index a5e9e5c244c7..d74d11bae77d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ArrayTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md
index 74aa8a86b74f..226952d1cecb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Banana.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Banana
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md
index 10ea538f5902..f99aab99e387 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BananaReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BananaReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md
index 36c2df9673a1..681be0bc7e30 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/BasquePig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BasquePig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md
index 74c1ab66db29..1b1352d918f4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Capitalization.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Capitalization
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md
index 8975864ba12f..aa1ac17604eb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Cat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Cat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md
index e6f320ac0deb..6cbaaa14e814 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/CatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.CatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md
index f7b8d4ebf743..032a1faeb3ff 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Category.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Category
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md
index ff376beebad9..8ce6449e5f22 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md
index 18044560aa87..864d33e80e7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ChildCatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md
index 51e52f4b7353..f39982657c89 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ClassModel.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ClassModel
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md
index 46da47c51249..65a6097ce3fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ComplexQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ComplexQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md
index 53f6a754270e..d9cf6527a3f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DanishPig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DanishPig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md
index d2447d2e0ac7..6f5de6b68511 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DefaultApi.md
@@ -63,6 +63,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md
index aa5df1a927a1..3aa00144e9aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Dog.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Dog
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md
index ef32aeb7148a..c1096f2c3105 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/DogAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DogAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md
index cdb1654356fa..6b7122940afa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Drawing.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Drawing
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
index 2dfe0e223884..8881585a4c7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumArrays.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumArrays
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md
index 4fb1eae9c066..38f309437db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md
index 5a6544a5172a..ac0ae4e6a8ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EnumTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md
index 9899d7c5db5b..ab06d96ca30b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/EquilateralTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EquilateralTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
index 7f5e0f57cab4..af8d565abfb1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeApi.md
@@ -78,6 +78,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -216,6 +218,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -285,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -354,6 +358,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -418,6 +423,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -554,6 +561,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -624,6 +632,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -723,6 +732,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -807,6 +817,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -890,6 +901,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -957,6 +969,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1026,6 +1039,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1102,6 +1116,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md
index 2a148644cc5b..13235fbd10f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FakeClassnameTags123Api.md
@@ -75,6 +75,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md
index 11192666c4f8..28959feda088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/File.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.File
 Must be named `File` for test.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md
index 244164accbe6..0ce4be56cc72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FileSchemaTestClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FileSchemaTestClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md
index fd84dc2038c9..92cf45723210 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Foo.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Foo
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md
index 3efa07e3b46e..39a70be7ad47 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FormatTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FormatTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md
index ab12d86b7c35..56b1c9f00abc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Fruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Fruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md
index 06120314fb65..5db6b0e2d1d8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/FruitReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FruitReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md
index 2cdabaa6ec68..2cc2d496e673 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GmFruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GmFruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md
index 2879f720f42f..461ebfe34c2c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/GrandparentAnimal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GrandparentAnimal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md
index 4a5d17ea8878..64549c18b0a1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HasOnlyReadOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.HasOnlyReadOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md
index 44c5cd47b65e..f7d1a7eb6886 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/HealthCheckResult.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.HealthCheckResult
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/InlineResponseDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/InlineResponseDefault.md
index 8c96fb62ac88..e3d55e133f38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/InlineResponseDefault.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.InlineResponseDefault
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md
index d4ac347e2e5a..f0eef14fabba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/IsoscelesTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.IsoscelesTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md
index 484c2a0992c6..2862c7e5321f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/List.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.List
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md
index b3f243cc6e28..aab8f4db9c75 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Mammal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Mammal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
index b2e30bde4c37..dc1ebba4e760 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MapTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MapTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9aa858ade8d0..5f57db957d78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md
index 668f456c6902..31f4d86fe43d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Model200Response.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Model200Response
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
index ecc7b60ce558..8a1bd169a2f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ModelClient.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ModelClient
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md
index c75e5d034e5a..692af702b5bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Name.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Name
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md
index 0ca2455a4ab2..7bab4fa20ee9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NullableClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md
index 4fe318e4a16d..f8fb004da806 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NullableShape.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.NullableShape
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md
index a2ca39cc52bd..14a7c0f1071b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/NumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md
index 13eb4a56bd5a..66c55c3b4737 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Order.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Order
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md
index 4f026f75b74d..eb42bcc1aaa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterComposite.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterComposite
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md
index 22713352ca08..245765c78452 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnum.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnum
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md
index 09f6b91ee623..3ffaa1086a64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md
index 149bb5a8dd16..567858392db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumInteger.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumInteger
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md
index 29de71509745..35c75a44372b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/OuterEnumIntegerDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md
index 188f0754e3b3..0e18ba6d591d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ParentPet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ParentPet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md
index 348d5c8d2217..c7224764e2d4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md
index 5acd4f352036..47820f406dd2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/PetApi.md
@@ -78,6 +78,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -223,6 +225,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -297,6 +300,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -373,6 +377,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -445,6 +450,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -521,6 +527,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -596,6 +603,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -671,6 +679,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md
index 6e9ea931901a..6e86d0760d5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Pig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md
index 2676d64eabb4..0165ddcc0e4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Quadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Quadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md
index 0fd001c58bc0..6daf340a1415 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/QuadrilateralInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.QuadrilateralInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md
index 5c3762e8803b..b3f4a17ea34e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ReadOnlyFirst.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ReadOnlyFirst
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md
index 56a0ac3de088..2c7c97e09dac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Return.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Return
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md
index 2ebc1db5b4ab..76da8f1de817 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ScaleneTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ScaleneTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md
index cabde4dffc94..9a54628cd411 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Shape.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Shape
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md
index 6126932df84d..57456d6793fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ShapeInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md
index 59c2453ac787..cbf61ebe77a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/ShapeOrNull.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ShapeOrNull
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md
index 5f55ec3e8337..c329495425d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SimpleQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SimpleQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
index e0008731e604..a27e685165a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/SpecialModelName.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SpecialModelName
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
index c0ed9ea43800..24e2480d5deb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/StoreApi.md
@@ -72,6 +72,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -284,6 +287,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md
index 718effdb02a9..fdd22eb31fdd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Tag.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Tag
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md
index 6578de980398..c4d0452b4e80 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Triangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Triangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md
index c354aa04761f..e0d8b5a59135 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/TriangleInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.TriangleInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md
index a6b2889dc60f..b0cd4dc042bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/User.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.User
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md
index 73b2c545a543..aa12c26c69f1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/UserApi.md
@@ -76,6 +76,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -143,6 +144,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -210,6 +212,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -279,6 +282,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -348,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -420,6 +425,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -484,6 +490,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -555,6 +562,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md
index cd60de874dc1..5fc3dc7f85c2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Whale.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Whale
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md
index 48da462bd08d..31e686adf0e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/docs/Zebra.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Zebra
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs
index af7e072e01db..55b5d137d6fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client
         /// <returns>Object representation of the JSON string.</returns>
         internal object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
-
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client
             if (type == typeof(Stream))
             {
                 var bytes = response.RawBytes;
-                if (headers != null)
+                if (response.Headers != null)
                 {
                     var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath)
                         ? Path.GetTempPath()
                         : _configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
-                    foreach (var header in headers)
+                    foreach (var header in response.Headers)
                     {
                         var match = regex.Match(header.ToString());
                         if (match.Success)
@@ -482,10 +480,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
@@ -597,10 +592,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index e8dad4cbc46b..1b9f9b7a99fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -137,16 +137,16 @@ namespace Org.OpenAPITools.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace Org.OpenAPITools.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace Org.OpenAPITools.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace Org.OpenAPITools.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace Org.OpenAPITools.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace Org.OpenAPITools.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace Org.OpenAPITools.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace Org.OpenAPITools.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace Org.OpenAPITools.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace Org.OpenAPITools.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace Org.OpenAPITools.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace Org.OpenAPITools.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs
index b8c87a97cbbd..132be5b4d3bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Fruit.cs
@@ -147,12 +147,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Apple).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Apple");
                 match++;
             }
@@ -164,12 +167,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Banana).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Banana");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs
index 7d993f7c4878..380896933df8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -156,12 +156,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(AppleReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("AppleReq");
                 match++;
             }
@@ -173,12 +176,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BananaReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BananaReq");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs
index 33bf0090e189..2e847a10eb6c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Mammal.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "Pig":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "whale":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "zebra":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Pig).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Pig");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Whale).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Whale");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Zebra).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Zebra");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs
index 1b19dc602899..80339ebf79bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 case "Triangle":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs
index e069390a316d..d8605861e63a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Pig.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "BasquePig":
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 case "DanishPig":
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BasquePig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BasquePig");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(DanishPig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("DanishPig");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs
index 617a437cc83e..17463ca09a4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "ComplexQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 case "SimpleQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ComplexQuadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("SimpleQuadrilateral");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs
index fc0f993a2079..e75e0e8b167f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Shape.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 case "Triangle":
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index c2605c769830..7471bafb3799 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 case "Triangle":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs
index f40a5b3b0044..cccaa79a8ff5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net47/src/Org.OpenAPITools/Model/Triangle.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "EquilateralTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "IsoscelesTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "ScaleneTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("EquilateralTriangle");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("IsoscelesTriangle");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ScaleneTriangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md
index fbcf3be947a5..c40cd0f8accb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md
index a97ce49b8018..f14b7a3ae4e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Animal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Animal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md
index 494fe14c5e68..93fca7e408ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AnotherFakeApi.md
@@ -70,6 +70,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md
index 1ac0bfc8acd7..bb723d2baa13 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ApiResponse.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ApiResponse
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md
index 1b3949b9f219..1f819f8f2816 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Apple.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Apple
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md
index 1a3f09548e8a..005b8f8058a4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/AppleReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AppleReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md
index a4acb4dfa7c8..4764c0ff80c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md
index c61636e35856..d93717103b8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md
index a5e9e5c244c7..d74d11bae77d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ArrayTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md
index 74aa8a86b74f..226952d1cecb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Banana.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Banana
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md
index 10ea538f5902..f99aab99e387 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BananaReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BananaReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md
index 36c2df9673a1..681be0bc7e30 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/BasquePig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BasquePig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md
index 74c1ab66db29..1b1352d918f4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Capitalization.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Capitalization
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md
index 8975864ba12f..aa1ac17604eb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Cat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Cat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md
index e6f320ac0deb..6cbaaa14e814 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/CatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.CatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md
index f7b8d4ebf743..032a1faeb3ff 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Category.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Category
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md
index ff376beebad9..8ce6449e5f22 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md
index 18044560aa87..864d33e80e7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ChildCatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md
index 51e52f4b7353..f39982657c89 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ClassModel.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ClassModel
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md
index 46da47c51249..65a6097ce3fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ComplexQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ComplexQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md
index 53f6a754270e..d9cf6527a3f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DanishPig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DanishPig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md
index d2447d2e0ac7..6f5de6b68511 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DefaultApi.md
@@ -63,6 +63,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md
index aa5df1a927a1..3aa00144e9aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Dog.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Dog
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md
index ef32aeb7148a..c1096f2c3105 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/DogAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DogAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md
index cdb1654356fa..6b7122940afa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Drawing.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Drawing
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
index 2dfe0e223884..8881585a4c7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumArrays.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumArrays
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md
index 4fb1eae9c066..38f309437db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md
index 5a6544a5172a..ac0ae4e6a8ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EnumTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md
index 9899d7c5db5b..ab06d96ca30b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/EquilateralTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EquilateralTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
index 7f5e0f57cab4..af8d565abfb1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeApi.md
@@ -78,6 +78,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -216,6 +218,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -285,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -354,6 +358,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -418,6 +423,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -554,6 +561,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -624,6 +632,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -723,6 +732,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -807,6 +817,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -890,6 +901,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -957,6 +969,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1026,6 +1039,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1102,6 +1116,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md
index 2a148644cc5b..13235fbd10f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FakeClassnameTags123Api.md
@@ -75,6 +75,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md
index 11192666c4f8..28959feda088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/File.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.File
 Must be named `File` for test.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md
index 244164accbe6..0ce4be56cc72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FileSchemaTestClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FileSchemaTestClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md
index fd84dc2038c9..92cf45723210 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Foo.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Foo
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md
index 3efa07e3b46e..39a70be7ad47 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FormatTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FormatTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md
index ab12d86b7c35..56b1c9f00abc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Fruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Fruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md
index 06120314fb65..5db6b0e2d1d8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/FruitReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FruitReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md
index 2cdabaa6ec68..2cc2d496e673 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GmFruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GmFruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md
index 2879f720f42f..461ebfe34c2c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/GrandparentAnimal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GrandparentAnimal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md
index 4a5d17ea8878..64549c18b0a1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HasOnlyReadOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.HasOnlyReadOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md
index 44c5cd47b65e..f7d1a7eb6886 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/HealthCheckResult.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.HealthCheckResult
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/InlineResponseDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/InlineResponseDefault.md
index 8c96fb62ac88..e3d55e133f38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/InlineResponseDefault.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.InlineResponseDefault
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md
index d4ac347e2e5a..f0eef14fabba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/IsoscelesTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.IsoscelesTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md
index 484c2a0992c6..2862c7e5321f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/List.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.List
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md
index b3f243cc6e28..aab8f4db9c75 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Mammal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Mammal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
index b2e30bde4c37..dc1ebba4e760 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MapTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MapTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9aa858ade8d0..5f57db957d78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md
index 668f456c6902..31f4d86fe43d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Model200Response.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Model200Response
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
index ecc7b60ce558..8a1bd169a2f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ModelClient.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ModelClient
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md
index c75e5d034e5a..692af702b5bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Name.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Name
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md
index 0ca2455a4ab2..7bab4fa20ee9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NullableClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md
index 4fe318e4a16d..f8fb004da806 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NullableShape.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.NullableShape
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md
index a2ca39cc52bd..14a7c0f1071b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/NumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md
index 13eb4a56bd5a..66c55c3b4737 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Order.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Order
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md
index 4f026f75b74d..eb42bcc1aaa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterComposite.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterComposite
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md
index 22713352ca08..245765c78452 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnum.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnum
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md
index 09f6b91ee623..3ffaa1086a64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md
index 149bb5a8dd16..567858392db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumInteger.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumInteger
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md
index 29de71509745..35c75a44372b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/OuterEnumIntegerDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md
index 188f0754e3b3..0e18ba6d591d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ParentPet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ParentPet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md
index 348d5c8d2217..c7224764e2d4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md
index 5acd4f352036..47820f406dd2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/PetApi.md
@@ -78,6 +78,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -223,6 +225,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -297,6 +300,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -373,6 +377,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -445,6 +450,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -521,6 +527,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -596,6 +603,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -671,6 +679,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md
index 6e9ea931901a..6e86d0760d5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Pig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md
index 2676d64eabb4..0165ddcc0e4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Quadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Quadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md
index 0fd001c58bc0..6daf340a1415 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/QuadrilateralInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.QuadrilateralInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md
index 5c3762e8803b..b3f4a17ea34e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ReadOnlyFirst.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ReadOnlyFirst
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md
index 56a0ac3de088..2c7c97e09dac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Return.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Return
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md
index 2ebc1db5b4ab..76da8f1de817 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ScaleneTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ScaleneTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md
index cabde4dffc94..9a54628cd411 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Shape.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Shape
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md
index 6126932df84d..57456d6793fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ShapeInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md
index 59c2453ac787..cbf61ebe77a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/ShapeOrNull.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ShapeOrNull
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md
index 5f55ec3e8337..c329495425d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SimpleQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SimpleQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
index e0008731e604..a27e685165a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/SpecialModelName.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SpecialModelName
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
index c0ed9ea43800..24e2480d5deb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/StoreApi.md
@@ -72,6 +72,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -284,6 +287,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md
index 718effdb02a9..fdd22eb31fdd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Tag.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Tag
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md
index 6578de980398..c4d0452b4e80 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Triangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Triangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md
index c354aa04761f..e0d8b5a59135 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/TriangleInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.TriangleInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md
index a6b2889dc60f..b0cd4dc042bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/User.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.User
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md
index 73b2c545a543..aa12c26c69f1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/UserApi.md
@@ -76,6 +76,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -143,6 +144,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -210,6 +212,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -279,6 +282,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -348,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -420,6 +425,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -484,6 +490,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -555,6 +562,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md
index cd60de874dc1..5fc3dc7f85c2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Whale.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Whale
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md
index 48da462bd08d..31e686adf0e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/docs/Zebra.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Zebra
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs
index af7e072e01db..55b5d137d6fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client
         /// <returns>Object representation of the JSON string.</returns>
         internal object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
-
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client
             if (type == typeof(Stream))
             {
                 var bytes = response.RawBytes;
-                if (headers != null)
+                if (response.Headers != null)
                 {
                     var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath)
                         ? Path.GetTempPath()
                         : _configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
-                    foreach (var header in headers)
+                    foreach (var header in response.Headers)
                     {
                         var match = regex.Match(header.ToString());
                         if (match.Success)
@@ -482,10 +480,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
@@ -597,10 +592,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index e8dad4cbc46b..1b9f9b7a99fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -137,16 +137,16 @@ namespace Org.OpenAPITools.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace Org.OpenAPITools.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace Org.OpenAPITools.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace Org.OpenAPITools.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace Org.OpenAPITools.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace Org.OpenAPITools.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace Org.OpenAPITools.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace Org.OpenAPITools.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace Org.OpenAPITools.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace Org.OpenAPITools.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace Org.OpenAPITools.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace Org.OpenAPITools.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs
index b8c87a97cbbd..132be5b4d3bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Fruit.cs
@@ -147,12 +147,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Apple).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Apple");
                 match++;
             }
@@ -164,12 +167,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Banana).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Banana");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs
index 7d993f7c4878..380896933df8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -156,12 +156,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(AppleReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("AppleReq");
                 match++;
             }
@@ -173,12 +176,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BananaReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BananaReq");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs
index 33bf0090e189..2e847a10eb6c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Mammal.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "Pig":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "whale":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "zebra":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Pig).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Pig");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Whale).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Whale");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Zebra).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Zebra");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs
index 1b19dc602899..80339ebf79bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 case "Triangle":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs
index e069390a316d..d8605861e63a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Pig.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "BasquePig":
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 case "DanishPig":
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BasquePig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BasquePig");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(DanishPig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("DanishPig");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs
index 617a437cc83e..17463ca09a4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "ComplexQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 case "SimpleQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ComplexQuadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("SimpleQuadrilateral");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs
index fc0f993a2079..e75e0e8b167f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Shape.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 case "Triangle":
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index c2605c769830..7471bafb3799 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 case "Triangle":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs
index f40a5b3b0044..cccaa79a8ff5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Model/Triangle.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "EquilateralTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "IsoscelesTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "ScaleneTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("EquilateralTriangle");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("IsoscelesTriangle");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ScaleneTriangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
index fbcf3be947a5..c40cd0f8accb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md
index a97ce49b8018..f14b7a3ae4e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Animal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Animal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md
index 494fe14c5e68..93fca7e408ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AnotherFakeApi.md
@@ -70,6 +70,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md
index 1ac0bfc8acd7..bb723d2baa13 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ApiResponse.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ApiResponse
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md
index 1b3949b9f219..1f819f8f2816 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Apple.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Apple
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md
index 1a3f09548e8a..005b8f8058a4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/AppleReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AppleReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
index a4acb4dfa7c8..4764c0ff80c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md
index c61636e35856..d93717103b8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md
index a5e9e5c244c7..d74d11bae77d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ArrayTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md
index 74aa8a86b74f..226952d1cecb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Banana.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Banana
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md
index 10ea538f5902..f99aab99e387 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BananaReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BananaReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md
index 36c2df9673a1..681be0bc7e30 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/BasquePig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BasquePig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md
index 74c1ab66db29..1b1352d918f4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Capitalization.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Capitalization
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md
index 8975864ba12f..aa1ac17604eb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Cat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Cat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md
index e6f320ac0deb..6cbaaa14e814 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/CatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.CatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md
index f7b8d4ebf743..032a1faeb3ff 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Category.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Category
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md
index ff376beebad9..8ce6449e5f22 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md
index 18044560aa87..864d33e80e7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ChildCatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
index 51e52f4b7353..f39982657c89 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ClassModel.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ClassModel
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md
index 46da47c51249..65a6097ce3fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ComplexQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ComplexQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md
index 53f6a754270e..d9cf6527a3f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DanishPig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DanishPig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md
index d2447d2e0ac7..6f5de6b68511 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DefaultApi.md
@@ -63,6 +63,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md
index aa5df1a927a1..3aa00144e9aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Dog.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Dog
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md
index ef32aeb7148a..c1096f2c3105 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/DogAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DogAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md
index cdb1654356fa..6b7122940afa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Drawing.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Drawing
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
index 2dfe0e223884..8881585a4c7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumArrays.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumArrays
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md
index 4fb1eae9c066..38f309437db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
index 5a6544a5172a..ac0ae4e6a8ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EnumTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md
index 9899d7c5db5b..ab06d96ca30b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/EquilateralTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EquilateralTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
index 7f5e0f57cab4..af8d565abfb1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeApi.md
@@ -78,6 +78,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -216,6 +218,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -285,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -354,6 +358,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -418,6 +423,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -554,6 +561,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -624,6 +632,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -723,6 +732,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -807,6 +817,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -890,6 +901,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -957,6 +969,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1026,6 +1039,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1102,6 +1116,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md
index 2a148644cc5b..13235fbd10f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FakeClassnameTags123Api.md
@@ -75,6 +75,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
index 11192666c4f8..28959feda088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/File.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.File
 Must be named `File` for test.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md
index 244164accbe6..0ce4be56cc72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FileSchemaTestClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FileSchemaTestClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md
index fd84dc2038c9..92cf45723210 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Foo.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Foo
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
index 3efa07e3b46e..39a70be7ad47 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FormatTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FormatTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md
index ab12d86b7c35..56b1c9f00abc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Fruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Fruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md
index 06120314fb65..5db6b0e2d1d8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/FruitReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FruitReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md
index 2cdabaa6ec68..2cc2d496e673 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GmFruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GmFruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md
index 2879f720f42f..461ebfe34c2c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/GrandparentAnimal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GrandparentAnimal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md
index 4a5d17ea8878..64549c18b0a1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HasOnlyReadOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.HasOnlyReadOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md
index 44c5cd47b65e..f7d1a7eb6886 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/HealthCheckResult.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.HealthCheckResult
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/InlineResponseDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/InlineResponseDefault.md
index 8c96fb62ac88..e3d55e133f38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/InlineResponseDefault.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.InlineResponseDefault
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md
index d4ac347e2e5a..f0eef14fabba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/IsoscelesTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.IsoscelesTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md
index 484c2a0992c6..2862c7e5321f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/List.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.List
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md
index b3f243cc6e28..aab8f4db9c75 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Mammal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Mammal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
index b2e30bde4c37..dc1ebba4e760 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MapTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MapTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9aa858ade8d0..5f57db957d78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
index 668f456c6902..31f4d86fe43d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Model200Response.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Model200Response
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
index ecc7b60ce558..8a1bd169a2f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ModelClient.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ModelClient
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
index c75e5d034e5a..692af702b5bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Name.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Name
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md
index 0ca2455a4ab2..7bab4fa20ee9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NullableClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md
index 4fe318e4a16d..f8fb004da806 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NullableShape.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.NullableShape
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md
index a2ca39cc52bd..14a7c0f1071b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/NumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md
index 13eb4a56bd5a..66c55c3b4737 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Order.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Order
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md
index 4f026f75b74d..eb42bcc1aaa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterComposite.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterComposite
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md
index 22713352ca08..245765c78452 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnum.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnum
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md
index 09f6b91ee623..3ffaa1086a64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md
index 149bb5a8dd16..567858392db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumInteger.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumInteger
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md
index 29de71509745..35c75a44372b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/OuterEnumIntegerDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md
index 188f0754e3b3..0e18ba6d591d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ParentPet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ParentPet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md
index 348d5c8d2217..c7224764e2d4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
index 5acd4f352036..47820f406dd2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/PetApi.md
@@ -78,6 +78,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -223,6 +225,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -297,6 +300,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -373,6 +377,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -445,6 +450,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -521,6 +527,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -596,6 +603,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -671,6 +679,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md
index 6e9ea931901a..6e86d0760d5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Pig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md
index 2676d64eabb4..0165ddcc0e4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Quadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Quadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md
index 0fd001c58bc0..6daf340a1415 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/QuadrilateralInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.QuadrilateralInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md
index 5c3762e8803b..b3f4a17ea34e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ReadOnlyFirst.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ReadOnlyFirst
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
index 56a0ac3de088..2c7c97e09dac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Return.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Return
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md
index 2ebc1db5b4ab..76da8f1de817 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ScaleneTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ScaleneTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md
index cabde4dffc94..9a54628cd411 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Shape.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Shape
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md
index 6126932df84d..57456d6793fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ShapeInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md
index 59c2453ac787..cbf61ebe77a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/ShapeOrNull.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ShapeOrNull
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md
index 5f55ec3e8337..c329495425d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SimpleQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SimpleQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
index e0008731e604..a27e685165a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/SpecialModelName.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SpecialModelName
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
index c0ed9ea43800..24e2480d5deb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/StoreApi.md
@@ -72,6 +72,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -284,6 +287,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md
index 718effdb02a9..fdd22eb31fdd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Tag.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Tag
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md
index 6578de980398..c4d0452b4e80 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Triangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Triangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md
index c354aa04761f..e0d8b5a59135 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/TriangleInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.TriangleInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md
index a6b2889dc60f..b0cd4dc042bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/User.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.User
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md
index 73b2c545a543..aa12c26c69f1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/UserApi.md
@@ -76,6 +76,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -143,6 +144,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -210,6 +212,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -279,6 +282,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -348,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -420,6 +425,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -484,6 +490,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -555,6 +562,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md
index cd60de874dc1..5fc3dc7f85c2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Whale.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Whale
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md
index 48da462bd08d..31e686adf0e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/docs/Zebra.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Zebra
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
index 1ca767977f21..cce6e896f05f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/Api/PetApiTests.cs
@@ -16,6 +16,8 @@ using System.Linq;
 using System.Reflection;
 using RestSharp;
 using Xunit;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Serialization;
 
 using Org.OpenAPITools.Client;
 using Org.OpenAPITools.Api;
@@ -341,6 +343,30 @@ namespace Org.OpenAPITools.Test
             //petApi.Configuration.AddDefaultHeader("header_key2", "header_value2");
         }
 
+        [Fact]
+        public void TestArrayOfString()
+        {
+            ArrayTest at = new ArrayTest();
+            JsonSerializerSettings _serializerSettings = new JsonSerializerSettings
+            {
+                // OpenAPI generated types generally hide default constructors.
+                ConstructorHandling = ConstructorHandling.AllowNonPublicDefaultConstructor,
+                ContractResolver = new DefaultContractResolver
+                {
+                    NamingStrategy = new CamelCaseNamingStrategy
+                    {
+                        OverrideSpecifiedNames = false
+                    }
+                }
+            };
+            Assert.Equal("{}", JsonConvert.SerializeObject(at, _serializerSettings));
+
+            at.ArrayOfString = new List<string> { "Something here ..." };
+
+            Assert.Equal("{\"array_of_string\":[\"Something here ...\"]}", JsonConvert.SerializeObject(at, _serializerSettings));
+
+        }
+
         public void Dispose()
         {
             // remove the pet after testing
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
index 58b2cc4021ce..6491bd5d97ad 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs
@@ -81,20 +81,47 @@ namespace Org.OpenAPITools.Test
 
             Assert.Equal("{\"lengthCm\":13.0}", f1.ToJson());
             Assert.Equal("{\"origin\":\"Japan\"}", f2.ToJson());
+        }
 
-            Fruit f3 = Fruit.FromJson("{\"lengthCm\":98}");
-            Assert.IsType<Banana>(f3.ActualInstance);
+        /// <summary>
+        /// Test Fruit with JSON payload matching both Apple and Banana
+        /// </summary>
+        [Fact]
+        public void TestFruitWithPayloadMatchingMoreThanOne()
+        {
+            // more than 1 match
+            Assert.Throws<InvalidDataException>(() => Fruit.FromJson("{\"origin\":\"Japan\"}"));
+            Assert.Throws<InvalidDataException>(() => Fruit.FromJson("{\"lengthCm\":98}"));
+        }
 
-            Fruit f4 = Fruit.FromJson("{\"origin\":\"Japan\"}");
-            // since banana allows additional properties, it will apple's JSON payload as well
-            Assert.IsType<Banana>(f4.ActualInstance);
+        /// <summary>
+        /// Apple Properties tests
+        /// </summary>
+        [Fact]
+        public void TestAppleProperties()
+        {
+            Assert.NotNull(typeof(Apple).GetProperty("Origin"));
+            Assert.NotNull(typeof(Apple).GetProperty("AdditionalProperties"));
+        }
 
-            // test custom deserializer
-            Fruit f5 = JsonConvert.DeserializeObject<Fruit>("{\"lengthCm\":98}");
-            Assert.IsType<Banana>(f5.ActualInstance);
+        /// <summary>
+        /// Apple tests
+        /// </summary>
+        [Fact]
+        public void TestApple()
+        {
+            Apple a = JsonConvert.DeserializeObject<Apple>("{\"origin\":\"Japan\"}", Fruit.AdditionalPropertiesSerializerSettings);
+            Assert.Equal("{\"origin\":\"Japan\"}", JsonConvert.SerializeObject(a));
+        }
 
-            // test custom serializer
-            Assert.Equal("{\"lengthCm\":98.0}", JsonConvert.SerializeObject(f5));
+        /// <summary>
+        /// Banana tests
+        /// </summary>
+        [Fact]
+        public void TestBanana()
+        {
+            Banana a = JsonConvert.DeserializeObject<Banana>("{\"lengthCm\":98}", Fruit.AdditionalPropertiesSerializerSettings);
+            Assert.Equal("{\"lengthCm\":98.0}", JsonConvert.SerializeObject(a));
         }
 
         /// <summary>
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
index 333527a75653..20ce7c8767c6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -95,8 +95,6 @@ namespace Org.OpenAPITools.Client
         /// <returns>Object representation of the JSON string.</returns>
         internal object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
-
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -106,13 +104,13 @@ namespace Org.OpenAPITools.Client
             if (type == typeof(Stream))
             {
                 var bytes = response.RawBytes;
-                if (headers != null)
+                if (response.Headers != null)
                 {
                     var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath)
                         ? Path.GetTempPath()
                         : _configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
-                    foreach (var header in headers)
+                    foreach (var header in response.Headers)
                     {
                         var match = regex.Match(header.ToString());
                         if (match.Success)
@@ -481,10 +479,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
@@ -596,10 +591,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index e8dad4cbc46b..1b9f9b7a99fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -137,16 +137,16 @@ namespace Org.OpenAPITools.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace Org.OpenAPITools.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace Org.OpenAPITools.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace Org.OpenAPITools.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace Org.OpenAPITools.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace Org.OpenAPITools.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace Org.OpenAPITools.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace Org.OpenAPITools.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace Org.OpenAPITools.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace Org.OpenAPITools.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace Org.OpenAPITools.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace Org.OpenAPITools.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs
index b8c87a97cbbd..132be5b4d3bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Fruit.cs
@@ -147,12 +147,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Apple).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Apple");
                 match++;
             }
@@ -164,12 +167,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Banana).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Banana");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs
index 7d993f7c4878..380896933df8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -156,12 +156,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(AppleReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("AppleReq");
                 match++;
             }
@@ -173,12 +176,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BananaReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BananaReq");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs
index 33bf0090e189..2e847a10eb6c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Mammal.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "Pig":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "whale":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 case "zebra":
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
-                    }
                     return newMammal;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Mammal. Possible values: Pig whale zebra", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Pig).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Pig");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Whale).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Whale");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Zebra).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Zebra");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs
index 1b19dc602899..80339ebf79bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 case "Triangle":
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
-                    }
                     return newNullableShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for NullableShape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs
index e069390a316d..d8605861e63a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Pig.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "BasquePig":
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 case "DanishPig":
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newPig.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
-                    }
                     return newPig;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Pig. Possible values: BasquePig DanishPig", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BasquePig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BasquePig");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(DanishPig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("DanishPig");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs
index 617a437cc83e..17463ca09a4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "ComplexQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 case "SimpleQuadrilateral":
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
-                    }
                     return newQuadrilateral;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Quadrilateral. Possible values: ComplexQuadrilateral SimpleQuadrilateral", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ComplexQuadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("SimpleQuadrilateral");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs
index fc0f993a2079..e75e0e8b167f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Shape.cs
@@ -149,19 +149,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 case "Triangle":
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShape.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
-                    }
                     return newShape;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Shape. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -173,12 +163,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -190,12 +183,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index c2605c769830..7471bafb3799 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -158,19 +158,9 @@ namespace Org.OpenAPITools.Model
             {
                 case "Quadrilateral":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 case "Triangle":
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
-                    }
                     return newShapeOrNull;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for ShapeOrNull. Possible values: Quadrilateral Triangle", discriminatorValue));
@@ -182,12 +172,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -199,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs
index f40a5b3b0044..cccaa79a8ff5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClient/src/Org.OpenAPITools/Model/Triangle.cs
@@ -175,27 +175,12 @@ namespace Org.OpenAPITools.Model
             {
                 case "EquilateralTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "IsoscelesTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 case "ScaleneTriangle":
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
-                    // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                    if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
-                    {
-                        newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
-                    }
                     return newTriangle;
                 default:
                     System.Diagnostics.Debug.WriteLine(String.Format("Failed to lookup discriminator value `{0}` for Triangle. Possible values: EquilateralTriangle IsoscelesTriangle ScaleneTriangle", discriminatorValue));
@@ -207,12 +192,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("EquilateralTriangle");
                 match++;
             }
@@ -224,12 +212,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("IsoscelesTriangle");
                 match++;
             }
@@ -241,12 +232,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ScaleneTriangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
index fbcf3be947a5..c40cd0f8accb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md
index a97ce49b8018..f14b7a3ae4e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Animal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Animal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md
index 494fe14c5e68..93fca7e408ac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AnotherFakeApi.md
@@ -70,6 +70,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md
index 1ac0bfc8acd7..bb723d2baa13 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ApiResponse.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ApiResponse
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md
index 1b3949b9f219..1f819f8f2816 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Apple.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Apple
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md
index 1a3f09548e8a..005b8f8058a4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/AppleReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.AppleReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
index a4acb4dfa7c8..4764c0ff80c5 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
index c61636e35856..d93717103b8b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayOfNumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayOfNumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md
index a5e9e5c244c7..d74d11bae77d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ArrayTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ArrayTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md
index 74aa8a86b74f..226952d1cecb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Banana.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Banana
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md
index 10ea538f5902..f99aab99e387 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BananaReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BananaReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md
index 36c2df9673a1..681be0bc7e30 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/BasquePig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.BasquePig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md
index 74c1ab66db29..1b1352d918f4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Capitalization.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Capitalization
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md
index 8975864ba12f..aa1ac17604eb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Cat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Cat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md
index e6f320ac0deb..6cbaaa14e814 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/CatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.CatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md
index f7b8d4ebf743..032a1faeb3ff 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Category.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Category
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md
index ff376beebad9..8ce6449e5f22 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCat.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCat
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md
index 18044560aa87..864d33e80e7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ChildCatAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ChildCatAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
index 51e52f4b7353..f39982657c89 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ClassModel.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ClassModel
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md
index 46da47c51249..65a6097ce3fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ComplexQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ComplexQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md
index 53f6a754270e..d9cf6527a3f6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DanishPig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DanishPig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md
index d2447d2e0ac7..6f5de6b68511 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DefaultApi.md
@@ -63,6 +63,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md
index aa5df1a927a1..3aa00144e9aa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Dog.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Dog
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md
index ef32aeb7148a..c1096f2c3105 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/DogAllOf.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.DogAllOf
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md
index cdb1654356fa..6b7122940afa 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Drawing.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Drawing
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
index 2dfe0e223884..8881585a4c7a 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumArrays.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumArrays
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md
index 4fb1eae9c066..38f309437db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
index 5a6544a5172a..ac0ae4e6a8ec 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EnumTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EnumTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md
index 9899d7c5db5b..ab06d96ca30b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/EquilateralTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.EquilateralTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
index 7f5e0f57cab4..af8d565abfb1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeApi.md
@@ -78,6 +78,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -216,6 +218,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -285,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -354,6 +358,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -418,6 +423,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -554,6 +561,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -624,6 +632,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -723,6 +732,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -807,6 +817,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -890,6 +901,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -957,6 +969,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1026,6 +1039,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1102,6 +1116,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
index 2a148644cc5b..13235fbd10f0 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FakeClassnameTags123Api.md
@@ -75,6 +75,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
index 11192666c4f8..28959feda088 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/File.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.File
 Must be named `File` for test.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md
index 244164accbe6..0ce4be56cc72 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FileSchemaTestClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FileSchemaTestClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md
index fd84dc2038c9..92cf45723210 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Foo.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Foo
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
index 3efa07e3b46e..39a70be7ad47 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FormatTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FormatTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md
index ab12d86b7c35..56b1c9f00abc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Fruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Fruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md
index 06120314fb65..5db6b0e2d1d8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/FruitReq.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.FruitReq
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md
index 2cdabaa6ec68..2cc2d496e673 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GmFruit.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GmFruit
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md
index 2879f720f42f..461ebfe34c2c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/GrandparentAnimal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.GrandparentAnimal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md
index 4a5d17ea8878..64549c18b0a1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HasOnlyReadOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.HasOnlyReadOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md
index 44c5cd47b65e..f7d1a7eb6886 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/HealthCheckResult.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.HealthCheckResult
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/InlineResponseDefault.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/InlineResponseDefault.md
index 8c96fb62ac88..e3d55e133f38 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/InlineResponseDefault.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.InlineResponseDefault
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md
index d4ac347e2e5a..f0eef14fabba 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/IsoscelesTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.IsoscelesTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md
index 484c2a0992c6..2862c7e5321f 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/List.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.List
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md
index b3f243cc6e28..aab8f4db9c75 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Mammal.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Mammal
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
index b2e30bde4c37..dc1ebba4e760 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MapTest.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MapTest
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 9aa858ade8d0..5f57db957d78 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.MixedPropertiesAndAdditionalPropertiesClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
index 668f456c6902..31f4d86fe43d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Model200Response.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Model200Response
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
index ecc7b60ce558..8a1bd169a2f2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ModelClient.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ModelClient
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
index c75e5d034e5a..692af702b5bb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Name.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Name
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md
index 0ca2455a4ab2..7bab4fa20ee9 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableClass.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NullableClass
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md
index 4fe318e4a16d..f8fb004da806 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NullableShape.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.NullableShape
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md
index a2ca39cc52bd..14a7c0f1071b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/NumberOnly.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.NumberOnly
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md
index 13eb4a56bd5a..66c55c3b4737 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Order.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Order
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md
index 4f026f75b74d..eb42bcc1aaa4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterComposite.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterComposite
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md
index 22713352ca08..245765c78452 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnum.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnum
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md
index 09f6b91ee623..3ffaa1086a64 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md
index 149bb5a8dd16..567858392db3 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumInteger.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumInteger
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md
index 29de71509745..35c75a44372b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/OuterEnumIntegerDefaultValue.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.OuterEnumIntegerDefaultValue
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md
index 188f0754e3b3..0e18ba6d591d 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ParentPet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ParentPet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md
index 348d5c8d2217..c7224764e2d4 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pet.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
index 5acd4f352036..47820f406dd2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/PetApi.md
@@ -78,6 +78,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -223,6 +225,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -297,6 +300,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -373,6 +377,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -445,6 +450,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -521,6 +527,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -596,6 +603,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -671,6 +679,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md
index 6e9ea931901a..6e86d0760d5b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Pig.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Pig
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md
index 2676d64eabb4..0165ddcc0e4b 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Quadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Quadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md
index 0fd001c58bc0..6daf340a1415 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/QuadrilateralInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.QuadrilateralInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md
index 5c3762e8803b..b3f4a17ea34e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ReadOnlyFirst.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ReadOnlyFirst
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
index 56a0ac3de088..2c7c97e09dac 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Return.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.Return
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md
index 2ebc1db5b4ab..76da8f1de817 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ScaleneTriangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ScaleneTriangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md
index cabde4dffc94..9a54628cd411 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Shape.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Shape
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md
index 6126932df84d..57456d6793fe 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.ShapeInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md
index 59c2453ac787..cbf61ebe77a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/ShapeOrNull.md
@@ -1,5 +1,6 @@
 # Org.OpenAPITools.Model.ShapeOrNull
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md
index 5f55ec3e8337..c329495425d1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SimpleQuadrilateral.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SimpleQuadrilateral
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
index e0008731e604..a27e685165a6 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/SpecialModelName.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.SpecialModelName
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
index c0ed9ea43800..24e2480d5deb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/StoreApi.md
@@ -72,6 +72,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -284,6 +287,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md
index 718effdb02a9..fdd22eb31fdd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Tag.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Tag
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md
index 6578de980398..c4d0452b4e80 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Triangle.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Triangle
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md
index c354aa04761f..e0d8b5a59135 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/TriangleInterface.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.TriangleInterface
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md
index a6b2889dc60f..b0cd4dc042bf 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/User.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.User
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md
index 73b2c545a543..aa12c26c69f1 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/UserApi.md
@@ -76,6 +76,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -143,6 +144,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -210,6 +212,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -279,6 +282,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -348,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -420,6 +425,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -484,6 +490,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -555,6 +562,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md
index cd60de874dc1..5fc3dc7f85c2 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Whale.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Whale
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md
index 48da462bd08d..31e686adf0e7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/docs/Zebra.md
@@ -1,4 +1,5 @@
 # Org.OpenAPITools.Model.Zebra
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
index af7e072e01db..55b5d137d6fb 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/ApiClient.cs
@@ -96,8 +96,6 @@ namespace Org.OpenAPITools.Client
         /// <returns>Object representation of the JSON string.</returns>
         internal object Deserialize(IRestResponse response, Type type)
         {
-            IList<Parameter> headers = response.Headers;
-
             if (type == typeof(byte[])) // return byte array
             {
                 return response.RawBytes;
@@ -107,13 +105,13 @@ namespace Org.OpenAPITools.Client
             if (type == typeof(Stream))
             {
                 var bytes = response.RawBytes;
-                if (headers != null)
+                if (response.Headers != null)
                 {
                     var filePath = String.IsNullOrEmpty(_configuration.TempFolderPath)
                         ? Path.GetTempPath()
                         : _configuration.TempFolderPath;
                     var regex = new Regex(@"Content-Disposition=.*filename=['""]?([^'""\s]+)['""]?$");
-                    foreach (var header in headers)
+                    foreach (var header in response.Headers)
                     {
                         var match = regex.Match(header.ToString());
                         if (match.Success)
@@ -482,10 +480,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
@@ -597,10 +592,7 @@ namespace Org.OpenAPITools.Client
             // if the response type is oneOf/anyOf, call FromJSON to deserialize the data
             if (typeof(Org.OpenAPITools.Model.AbstractOpenAPISchema).IsAssignableFrom(typeof(T)))
             {
-                T instance = (T)Activator.CreateInstance(typeof(T));
-                MethodInfo method = typeof(T).GetMethod("FromJson");
-                method.Invoke(instance, new object[] { response.Content });
-                response.Data = instance;
+                response.Data = (T) typeof(T).GetMethod("FromJson").Invoke(null, new object[] { response.Content });
             }
             else if (typeof(T).Name == "Stream") // for binary response
             {
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
index e8dad4cbc46b..1b9f9b7a99fc 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Client/HttpSigningConfiguration.cs
@@ -137,16 +137,16 @@ namespace Org.OpenAPITools.Client
                 }
 #else
                 if (parameter.Value.Count > 1)
-                    { // array
+                { // array
                     foreach (var value in parameter.Value)
                     {
                         httpValues.Add(parameter.Key + "[]", value);
                     }
-                    }
-                    else
-                    {
-                        httpValues.Add(parameter.Key, parameter.Value[0]);
-                    }
+                }
+                else
+                {
+                    httpValues.Add(parameter.Key, parameter.Value[0]);
+                }
 #endif
             }
             var uriBuilder = new UriBuilder(string.Concat(basePath, path));
@@ -256,7 +256,6 @@ namespace Org.OpenAPITools.Client
             var authorizationHeaderValue = string.Format("Signature keyId=\"{0}\",algorithm=\"{1}\"",
                 KeyId, cryptographicScheme);
 
-
             if (HttpSignatureHeader.ContainsKey(HEADER_CREATED))
             {
                 authorizationHeaderValue += string.Format(",created={0}", HttpSignatureHeader[HEADER_CREATED]);
@@ -278,7 +277,6 @@ namespace Org.OpenAPITools.Client
         private byte[] GetStringHash(string hashName, string stringToBeHashed)
         {
             var hashAlgorithm = System.Security.Cryptography.HashAlgorithm.Create(hashName);
-
             var bytes = Encoding.UTF8.GetBytes(stringToBeHashed);
             var stringHash = hashAlgorithm.ComputeHash(bytes);
             return stringHash;
@@ -298,7 +296,6 @@ namespace Org.OpenAPITools.Client
             {
                 var signedbytes = rsa.SignHash(stringToSign, HashAlgorithm, RSASignaturePadding.Pss);
                 return Convert.ToBase64String(signedbytes);
-
             }
             else if (SigningAlgorithm == "PKCS1-v15")
             {
@@ -472,16 +469,22 @@ namespace Org.OpenAPITools.Client
 
                 //-------- read PEM encryption info. lines and extract salt -----
                 if (!str.ReadLine().StartsWith("Proc-Type: 4,ENCRYPTED"))
+                {
                     return null;
+                }
                 String saltline = str.ReadLine();
                 if (!saltline.StartsWith("DEK-Info: DES-EDE3-CBC,"))
+                {
                     return null;
+                }
                 String saltstr = saltline.Substring(saltline.IndexOf(",") + 1).Trim();
                 byte[] salt = new byte[saltstr.Length / 2];
                 for (int i = 0; i < salt.Length; i++)
                     salt[i] = Convert.ToByte(saltstr.Substring(i * 2, 2), 16);
                 if (!(str.ReadLine() == ""))
+                {
                     return null;
+                }
 
                 //------ remaining b64 data is encrypted RSA key ----
                 String encryptedstr = str.ReadToEnd();
@@ -497,7 +500,9 @@ namespace Org.OpenAPITools.Client
 
                 byte[] deskey = GetEncryptedKey(salt, keyPassPharse, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
                 if (deskey == null)
+                {
                     return null;
+                }
 
                 //------ Decrypt the encrypted 3des-encrypted RSA private key ------
                 byte[] rsakey = DecryptKey(binkey, deskey, salt); //OpenSSL uses salt value in PEM header also as 3DES IV
@@ -519,18 +524,28 @@ namespace Org.OpenAPITools.Client
             {
                 twobytes = binr.ReadUInt16();
                 if (twobytes == 0x8130) //data read as little endian order (actual data order for Sequence is 30 81)
+                {
                     binr.ReadByte();    //advance 1 byte
+                }
                 else if (twobytes == 0x8230)
+                {
                     binr.ReadInt16();   //advance 2 bytes
+                }
                 else
+                {
                     return null;
+                }
 
                 twobytes = binr.ReadUInt16();
                 if (twobytes != 0x0102) //version number
+                {
                     return null;
+                }
                 bt = binr.ReadByte();
                 if (bt != 0x00)
+                {
                     return null;
+                }
 
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
@@ -575,7 +590,10 @@ namespace Org.OpenAPITools.Client
             {
                 return null;
             }
-            finally { binr.Close(); }
+            finally
+            {
+                binr.Close();
+            }
         }
 
         private int GetIntegerSize(BinaryReader binr)
@@ -585,12 +603,16 @@ namespace Org.OpenAPITools.Client
             byte highbyte = 0x00;
             int count = 0;
             bt = binr.ReadByte();
-            if (bt != 0x02)     //expect integer
+            if (bt != 0x02) //expect integer
+            {
                 return 0;
+            }
             bt = binr.ReadByte();
 
             if (bt == 0x81)
+            {
                 count = binr.ReadByte();    // data size in next byte
+            }
             else if (bt == 0x82)
             {
                 highbyte = binr.ReadByte(); // data size in next 2 bytes
@@ -603,7 +625,8 @@ namespace Org.OpenAPITools.Client
                 count = bt;     // we already have the data size
             }
             while (binr.ReadByte() == 0x00)
-            {   //remove high order zeros in data
+            {
+                //remove high order zeros in data
                 count -= 1;
             }
             binr.BaseStream.Seek(-1, SeekOrigin.Current);
@@ -636,7 +659,9 @@ namespace Org.OpenAPITools.Client
             {
                 // ----  Now hash consecutively for count times ------
                 if (j == 0)
+                {
                     result = data00;    //initialize
+                }
                 else
                 {
                     Array.Copy(result, hashtarget, result.Length);
@@ -714,7 +739,7 @@ namespace Org.OpenAPITools.Client
                 key[key.Length - 1].ToString().Contains(ecPrivateKeyFooter))
             {
 
-                /*this type of key can hold many type different types of private key, but here due lack of pem header
+                /* this type of key can hold many type different types of private key, but here due lack of pem header
                 Considering this as EC key
                 */
                 //TODO :- update the key based on oid
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs
index b8c87a97cbbd..132be5b4d3bd 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Fruit.cs
@@ -147,12 +147,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Apple).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Apple>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Apple");
                 match++;
             }
@@ -164,12 +167,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruit.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Banana).GetProperty("AdditionalProperties") == null)
                 {
                     newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.SerializerSettings));
                 }
+                else
+                {
+                    newFruit = new Fruit(JsonConvert.DeserializeObject<Banana>(jsonString, Fruit.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Banana");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs
index 7d993f7c4878..380896933df8 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/FruitReq.cs
@@ -156,12 +156,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(AppleReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<AppleReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("AppleReq");
                 match++;
             }
@@ -173,12 +176,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newFruitReq.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BananaReq).GetProperty("AdditionalProperties") == null)
                 {
                     newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.SerializerSettings));
                 }
+                else
+                {
+                    newFruitReq = new FruitReq(JsonConvert.DeserializeObject<BananaReq>(jsonString, FruitReq.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BananaReq");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs
index 228dc256e21c..93652cebd2d7 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Mammal.cs
@@ -174,12 +174,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Pig).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Pig>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Pig");
                 match++;
             }
@@ -191,12 +194,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Whale).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Whale>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Whale");
                 match++;
             }
@@ -208,12 +214,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newMammal.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Zebra).GetProperty("AdditionalProperties") == null)
                 {
                     newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.SerializerSettings));
                 }
+                else
+                {
+                    newMammal = new Mammal(JsonConvert.DeserializeObject<Zebra>(jsonString, Mammal.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Zebra");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs
index 189ad4a48620..e3b59f31af65 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/NullableShape.cs
@@ -157,12 +157,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -174,12 +177,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newNullableShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.SerializerSettings));
                 }
+                else
+                {
+                    newNullableShape = new NullableShape(JsonConvert.DeserializeObject<Triangle>(jsonString, NullableShape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs
index 15e278df6e40..9ae61e766681 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Pig.cs
@@ -148,12 +148,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(BasquePig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<BasquePig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("BasquePig");
                 match++;
             }
@@ -165,12 +168,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newPig.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(DanishPig).GetProperty("AdditionalProperties") == null)
                 {
                     newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.SerializerSettings));
                 }
+                else
+                {
+                    newPig = new Pig(JsonConvert.DeserializeObject<DanishPig>(jsonString, Pig.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("DanishPig");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs
index aa08c038d7b6..f35df8fc7a1e 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Quadrilateral.cs
@@ -148,12 +148,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ComplexQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<ComplexQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ComplexQuadrilateral");
                 match++;
             }
@@ -165,12 +168,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newQuadrilateral.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(SimpleQuadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.SerializerSettings));
                 }
+                else
+                {
+                    newQuadrilateral = new Quadrilateral(JsonConvert.DeserializeObject<SimpleQuadrilateral>(jsonString, Quadrilateral.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("SimpleQuadrilateral");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs
index 2dccb10fb13b..6fd2c2fba81c 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Shape.cs
@@ -148,12 +148,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -165,12 +168,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShape.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.SerializerSettings));
                 }
+                else
+                {
+                    newShape = new Shape(JsonConvert.DeserializeObject<Triangle>(jsonString, Shape.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
index 66560fe44610..8adfde1b0678 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/ShapeOrNull.cs
@@ -157,12 +157,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Quadrilateral).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Quadrilateral>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Quadrilateral");
                 match++;
             }
@@ -174,12 +177,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newShapeOrNull.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(Triangle).GetProperty("AdditionalProperties") == null)
                 {
                     newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.SerializerSettings));
                 }
+                else
+                {
+                    newShapeOrNull = new ShapeOrNull(JsonConvert.DeserializeObject<Triangle>(jsonString, ShapeOrNull.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("Triangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs
index adefd59fa305..5979a1ea74ce 100644
--- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs
+++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Model/Triangle.cs
@@ -174,12 +174,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(EquilateralTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<EquilateralTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("EquilateralTriangle");
                 match++;
             }
@@ -191,12 +194,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(IsoscelesTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<IsoscelesTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("IsoscelesTriangle");
                 match++;
             }
@@ -208,12 +214,15 @@ namespace Org.OpenAPITools.Model
 
             try
             {
-                newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
                 // if it does not contains "AdditionalProperties", use SerializerSettings to deserialize
-                if (newTriangle.GetType().GetProperty("AdditionalProperties") == null)
+                if (typeof(ScaleneTriangle).GetProperty("AdditionalProperties") == null)
                 {
                     newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.SerializerSettings));
                 }
+                else
+                {
+                    newTriangle = new Triangle(JsonConvert.DeserializeObject<ScaleneTriangle>(jsonString, Triangle.AdditionalPropertiesSerializerSettings));
+                }
                 matchedTypes.Add("ScaleneTriangle");
                 match++;
             }
diff --git a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
index 84bc49474464..e89ea3a5a58d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
+++ b/samples/client/petstore/csharp/OpenAPIClient/.openapi-generator/FILES
@@ -45,6 +45,7 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
@@ -110,6 +111,7 @@ src/Org.OpenAPITools/Model/OuterEnum.cs
 src/Org.OpenAPITools/Model/OuterEnumDefaultValue.cs
 src/Org.OpenAPITools/Model/OuterEnumInteger.cs
 src/Org.OpenAPITools/Model/OuterEnumIntegerDefaultValue.cs
+src/Org.OpenAPITools/Model/OuterObjectWithEnumProperty.cs
 src/Org.OpenAPITools/Model/Pet.cs
 src/Org.OpenAPITools/Model/ReadOnlyFirst.cs
 src/Org.OpenAPITools/Model/Return.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient/README.md b/samples/client/petstore/csharp/OpenAPIClient/README.md
index b99f1f79d97c..f33c01b2a43d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/README.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/README.md
@@ -113,6 +113,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**FakePropertyEnumIntegerSerialize**](docs/FakeApi.md#fakepropertyenumintegerserialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**TestBodyWithFileSchema**](docs/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
@@ -185,6 +186,7 @@ Class | Method | HTTP request | Description
  - [Model.OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [Model.OuterEnumInteger](docs/OuterEnumInteger.md)
  - [Model.OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [Model.OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [Model.Pet](docs/Pet.md)
  - [Model.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Model.Return](docs/Return.md)
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
index c7cb3d05138b..4e201d824b2d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/AnotherFakeApi.md
@@ -72,6 +72,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md
index 7ee074eba27c..5feca30d1de9 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/DefaultApi.md
@@ -65,6 +65,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
index 38ab478e715b..64474672ca8f 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**FakeOuterCompositeSerialize**](FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 [**FakeOuterNumberSerialize**](FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 [**FakeOuterStringSerialize**](FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+[**FakePropertyEnumIntegerSerialize**](FakeApi.md#fakepropertyenumintegerserialize) | **POST** /fake/property/enum-int | 
 [**TestBodyWithFileSchema**](FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 [**TestBodyWithQueryParams**](FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 [**TestClientModel**](FakeApi.md#testclientmodel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -80,6 +81,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -157,6 +159,7 @@ void (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -231,6 +234,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -305,6 +309,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -379,6 +384,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -453,6 +459,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -464,6 +471,81 @@ No authorization required
 [[Back to README]](../README.md)
 
 
+## FakePropertyEnumIntegerSerialize
+
+> OuterObjectWithEnumProperty FakePropertyEnumIntegerSerialize (OuterObjectWithEnumProperty outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example
+
+```csharp
+using System.Collections.Generic;
+using System.Diagnostics;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Client;
+using Org.OpenAPITools.Model;
+
+namespace Example
+{
+    public class FakePropertyEnumIntegerSerializeExample
+    {
+        public static void Main()
+        {
+            Configuration.Default.BasePath = "http://petstore.swagger.io:80/v2";
+            var apiInstance = new FakeApi(Configuration.Default);
+            var outerObjectWithEnumProperty = new OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+
+            try
+            {
+                OuterObjectWithEnumProperty result = apiInstance.FakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
+                Debug.WriteLine(result);
+            }
+            catch (ApiException e)
+            {
+                Debug.Print("Exception when calling FakeApi.FakePropertyEnumIntegerSerialize: " + e.Message );
+                Debug.Print("Status Code: "+ e.ErrorCode);
+                Debug.Print(e.StackTrace);
+            }
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: */*
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Output enum (int) |  -  |
+
+[[Back to top]](#)
+[[Back to API list]](../README.md#documentation-for-api-endpoints)
+[[Back to Model list]](../README.md#documentation-for-models)
+[[Back to README]](../README.md)
+
+
 ## TestBodyWithFileSchema
 
 > void TestBodyWithFileSchema (FileSchemaTestClass fileSchemaTestClass)
@@ -526,6 +608,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -599,6 +682,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -674,6 +758,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -778,6 +863,7 @@ void (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -867,6 +953,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -955,6 +1042,7 @@ void (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1027,6 +1115,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1101,6 +1190,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1182,6 +1272,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
index 93eb8b274552..c4d52011eca3 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/FakeClassnameTags123Api.md
@@ -77,6 +77,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..b97e65b97bea
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,13 @@
+
+# Org.OpenAPITools.Model.OuterObjectWithEnumProperty
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Value** | **OuterEnumInteger** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models)
+[[Back to API list]](../README.md#documentation-for-api-endpoints)
+[[Back to README]](../README.md)
+
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
index 9c0cc2b2951b..7f8dd7f0fb86 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/PetApi.md
@@ -80,6 +80,7 @@ void (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -158,6 +159,7 @@ void (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -237,6 +239,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -316,6 +319,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -397,6 +401,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -474,6 +479,7 @@ void (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -556,6 +562,7 @@ void (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -637,6 +644,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -717,6 +725,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
index d3c3c7c54053..eac4f3fcafcc 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/StoreApi.md
@@ -74,6 +74,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -151,6 +152,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -226,6 +228,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -301,6 +304,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md b/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
index 7c37179a9102..611bd412da59 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
+++ b/samples/client/petstore/csharp/OpenAPIClient/docs/UserApi.md
@@ -78,6 +78,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -150,6 +151,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -222,6 +224,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -296,6 +299,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -370,6 +374,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -447,6 +452,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -516,6 +522,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -592,6 +599,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterObjectWithEnumPropertyTests.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterObjectWithEnumPropertyTests.cs
new file mode 100644
index 000000000000..1c683cd900bf
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Model/OuterObjectWithEnumPropertyTests.cs
@@ -0,0 +1,79 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using NUnit.Framework;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test
+{
+    /// <summary>
+    ///  Class for testing OuterObjectWithEnumProperty
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class OuterObjectWithEnumPropertyTests
+    {
+        // TODO uncomment below to declare an instance variable for OuterObjectWithEnumProperty
+        //private OuterObjectWithEnumProperty instance;
+
+        /// <summary>
+        /// Setup before each test
+        /// </summary>
+        [SetUp]
+        public void Init()
+        {
+            // TODO uncomment below to create an instance of OuterObjectWithEnumProperty
+            //instance = new OuterObjectWithEnumProperty();
+        }
+
+        /// <summary>
+        /// Clean up after each test
+        /// </summary>
+        [TearDown]
+        public void Cleanup()
+        {
+
+        }
+
+        /// <summary>
+        /// Test an instance of OuterObjectWithEnumProperty
+        /// </summary>
+        [Test]
+        public void OuterObjectWithEnumPropertyInstanceTest()
+        {
+            // TODO uncomment below to test "IsInstanceOf" OuterObjectWithEnumProperty
+            //Assert.IsInstanceOf(typeof(OuterObjectWithEnumProperty), instance);
+        }
+
+
+        /// <summary>
+        /// Test the property 'Value'
+        /// </summary>
+        [Test]
+        public void ValueTest()
+        {
+            // TODO unit test for the property 'Value'
+        }
+
+    }
+
+}
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
index a48c0d43bb30..6161aa33d32d 100644
--- a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Api/FakeApi.cs
@@ -157,6 +157,27 @@ namespace Org.OpenAPITools.Api
         /// 
         /// </summary>
         /// <remarks>
+        /// Test serialization of enum (int) properties with examples
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <returns>OuterObjectWithEnumProperty</returns>
+        OuterObjectWithEnumProperty FakePropertyEnumIntegerSerialize (OuterObjectWithEnumProperty outerObjectWithEnumProperty);
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// Test serialization of enum (int) properties with examples
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <returns>ApiResponse of OuterObjectWithEnumProperty</returns>
+        ApiResponse<OuterObjectWithEnumProperty> FakePropertyEnumIntegerSerializeWithHttpInfo (OuterObjectWithEnumProperty outerObjectWithEnumProperty);
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
         /// For this test, the body for this request much reference a schema named &#x60;File&#x60;.
         /// </remarks>
         /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
@@ -550,6 +571,29 @@ namespace Org.OpenAPITools.Api
         /// 
         /// </summary>
         /// <remarks>
+        /// Test serialization of enum (int) properties with examples
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
+        /// <returns>Task of OuterObjectWithEnumProperty</returns>
+        System.Threading.Tasks.Task<OuterObjectWithEnumProperty> FakePropertyEnumIntegerSerializeAsync (OuterObjectWithEnumProperty outerObjectWithEnumProperty, CancellationToken cancellationToken = default(CancellationToken));
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
+        /// Test serialization of enum (int) properties with examples
+        /// </remarks>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
+        /// <returns>Task of ApiResponse (OuterObjectWithEnumProperty)</returns>
+        System.Threading.Tasks.Task<ApiResponse<OuterObjectWithEnumProperty>> FakePropertyEnumIntegerSerializeWithHttpInfoAsync (OuterObjectWithEnumProperty outerObjectWithEnumProperty, CancellationToken cancellationToken = default(CancellationToken));
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <remarks>
         /// For this test, the body for this request much reference a schema named &#x60;File&#x60;.
         /// </remarks>
         /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
@@ -1792,6 +1836,157 @@ namespace Org.OpenAPITools.Api
                 (string) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(string)));
         }
 
+        /// <summary>
+        ///  Test serialization of enum (int) properties with examples
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <returns>OuterObjectWithEnumProperty</returns>
+        public OuterObjectWithEnumProperty FakePropertyEnumIntegerSerialize (OuterObjectWithEnumProperty outerObjectWithEnumProperty)
+        {
+             ApiResponse<OuterObjectWithEnumProperty> localVarResponse = FakePropertyEnumIntegerSerializeWithHttpInfo(outerObjectWithEnumProperty);
+             return localVarResponse.Data;
+        }
+
+        /// <summary>
+        ///  Test serialization of enum (int) properties with examples
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <returns>ApiResponse of OuterObjectWithEnumProperty</returns>
+        public ApiResponse<OuterObjectWithEnumProperty> FakePropertyEnumIntegerSerializeWithHttpInfo (OuterObjectWithEnumProperty outerObjectWithEnumProperty)
+        {
+            // verify the required parameter 'outerObjectWithEnumProperty' is set
+            if (outerObjectWithEnumProperty == null)
+                throw new ApiException(400, "Missing required parameter 'outerObjectWithEnumProperty' when calling FakeApi->FakePropertyEnumIntegerSerialize");
+
+            var localVarPath = "/fake/property/enum-int";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (outerObjectWithEnumProperty != null && outerObjectWithEnumProperty.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(outerObjectWithEnumProperty); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = outerObjectWithEnumProperty; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) this.Configuration.ApiClient.CallApi(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakePropertyEnumIntegerSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<OuterObjectWithEnumProperty>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
+                (OuterObjectWithEnumProperty) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterObjectWithEnumProperty)));
+        }
+
+        /// <summary>
+        ///  Test serialization of enum (int) properties with examples
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
+        /// <returns>Task of OuterObjectWithEnumProperty</returns>
+        public async System.Threading.Tasks.Task<OuterObjectWithEnumProperty> FakePropertyEnumIntegerSerializeAsync (OuterObjectWithEnumProperty outerObjectWithEnumProperty, CancellationToken cancellationToken = default(CancellationToken))
+        {
+             ApiResponse<OuterObjectWithEnumProperty> localVarResponse = await FakePropertyEnumIntegerSerializeWithHttpInfoAsync(outerObjectWithEnumProperty, cancellationToken);
+             return localVarResponse.Data;
+
+        }
+
+        /// <summary>
+        ///  Test serialization of enum (int) properties with examples
+        /// </summary>
+        /// <exception cref="Org.OpenAPITools.Client.ApiException">Thrown when fails to make API call</exception>
+        /// <param name="outerObjectWithEnumProperty">Input enum (int) as post body</param>
+        /// <param name="cancellationToken">Cancellation Token to cancel request (optional) </param>
+        /// <returns>Task of ApiResponse (OuterObjectWithEnumProperty)</returns>
+        public async System.Threading.Tasks.Task<ApiResponse<OuterObjectWithEnumProperty>> FakePropertyEnumIntegerSerializeWithHttpInfoAsync (OuterObjectWithEnumProperty outerObjectWithEnumProperty, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            // verify the required parameter 'outerObjectWithEnumProperty' is set
+            if (outerObjectWithEnumProperty == null)
+                throw new ApiException(400, "Missing required parameter 'outerObjectWithEnumProperty' when calling FakeApi->FakePropertyEnumIntegerSerialize");
+
+            var localVarPath = "/fake/property/enum-int";
+            var localVarPathParams = new Dictionary<String, String>();
+            var localVarQueryParams = new List<KeyValuePair<String, String>>();
+            var localVarHeaderParams = new Dictionary<String, String>(this.Configuration.DefaultHeader);
+            var localVarFormParams = new Dictionary<String, String>();
+            var localVarFileParams = new Dictionary<String, FileParameter>();
+            Object localVarPostBody = null;
+
+            // to determine the Content-Type header
+            String[] localVarHttpContentTypes = new String[] {
+                "application/json"
+            };
+            String localVarHttpContentType = this.Configuration.ApiClient.SelectHeaderContentType(localVarHttpContentTypes);
+
+            // to determine the Accept header
+            String[] localVarHttpHeaderAccepts = new String[] {
+                "*/*"
+            };
+            String localVarHttpHeaderAccept = this.Configuration.ApiClient.SelectHeaderAccept(localVarHttpHeaderAccepts);
+            if (localVarHttpHeaderAccept != null)
+                localVarHeaderParams.Add("Accept", localVarHttpHeaderAccept);
+
+            if (outerObjectWithEnumProperty != null && outerObjectWithEnumProperty.GetType() != typeof(byte[]))
+            {
+                localVarPostBody = this.Configuration.ApiClient.Serialize(outerObjectWithEnumProperty); // http body (model) parameter
+            }
+            else
+            {
+                localVarPostBody = outerObjectWithEnumProperty; // byte array
+            }
+
+
+            // make the HTTP request
+            IRestResponse localVarResponse = (IRestResponse) await this.Configuration.ApiClient.CallApiAsync(localVarPath,
+                Method.POST, localVarQueryParams, localVarPostBody, localVarHeaderParams, localVarFormParams, localVarFileParams,
+                localVarPathParams, localVarHttpContentType, cancellationToken);
+
+            int localVarStatusCode = (int) localVarResponse.StatusCode;
+
+            if (ExceptionFactory != null)
+            {
+                Exception exception = ExceptionFactory("FakePropertyEnumIntegerSerialize", localVarResponse);
+                if (exception != null) throw exception;
+            }
+
+            return new ApiResponse<OuterObjectWithEnumProperty>(localVarStatusCode,
+                localVarResponse.Headers.ToDictionary(x => x.Name, x => string.Join(",", x.Value)),
+                (OuterObjectWithEnumProperty) this.Configuration.ApiClient.Deserialize(localVarResponse, typeof(OuterObjectWithEnumProperty)));
+        }
+
         /// <summary>
         ///  For this test, the body for this request much reference a schema named &#x60;File&#x60;.
         /// </summary>
diff --git a/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterObjectWithEnumProperty.cs b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterObjectWithEnumProperty.cs
new file mode 100644
index 000000000000..a7db86a7ba24
--- /dev/null
+++ b/samples/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools/Model/OuterObjectWithEnumProperty.cs
@@ -0,0 +1,138 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Runtime.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// OuterObjectWithEnumProperty
+    /// </summary>
+    [DataContract]
+    public partial class OuterObjectWithEnumProperty :  IEquatable<OuterObjectWithEnumProperty>, IValidatableObject
+    {
+        /// <summary>
+        /// Gets or Sets Value
+        /// </summary>
+        [DataMember(Name="value", EmitDefaultValue=true)]
+        public OuterEnumInteger Value { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OuterObjectWithEnumProperty" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected OuterObjectWithEnumProperty() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="OuterObjectWithEnumProperty" /> class.
+        /// </summary>
+        /// <param name="value">value (required).</param>
+        public OuterObjectWithEnumProperty(OuterEnumInteger value = default(OuterEnumInteger))
+        {
+            // to ensure "value" is required (not null)
+            if (value == null)
+            {
+                throw new InvalidDataException("value is a required property for OuterObjectWithEnumProperty and cannot be null");
+            }
+            else
+            {
+                this.Value = value;
+            }
+
+        }
+
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            var sb = new StringBuilder();
+            sb.Append("class OuterObjectWithEnumProperty {\n");
+            sb.Append("  Value: ").Append(Value).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return this.Equals(input as OuterObjectWithEnumProperty);
+        }
+
+        /// <summary>
+        /// Returns true if OuterObjectWithEnumProperty instances are equal
+        /// </summary>
+        /// <param name="input">Instance of OuterObjectWithEnumProperty to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(OuterObjectWithEnumProperty input)
+        {
+            if (input == null)
+                return false;
+
+            return 
+                (
+                    this.Value == input.Value ||
+                    (this.Value != null &&
+                    this.Value.Equals(input.Value))
+                );
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Value != null)
+                    hashCode = hashCode * 59 + this.Value.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> IValidatableObject.Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}
diff --git a/samples/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml b/samples/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
index f45f5e128cc5..cd7cef8cc4fa 100644
--- a/samples/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
+++ b/samples/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
@@ -2,13 +2,13 @@ name: openapi
 version: 1.0.0
 description: OpenAPI API client
 environment:
-    sdk: ">=2.7.0 <3.0.0"
+    sdk: '>=2.7.0 <3.0.0'
 dependencies:
     dio: ^3.0.9
-    built_value: ">=7.1.0 <9.0.0"
-    built_collection: ">=4.3.2 <6.0.0"
+    built_value: '>=7.1.0 <8.0.0'
+    built_collection: '>=4.3.2 <5.0.0'
 dev_dependencies:
-    built_value_generator: ">=7.1.0 <9.0.0"
+    built_value_generator: '>=7.1.0 <8.0.0'
     build_runner: ^1.7.1
-    test: ">=1.3.0 <1.16.0"
+    test: '>=1.3.0 <1.16.0'
 
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
index df7ee07412ed..c6446b856533 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
@@ -29,7 +29,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = body;
 
@@ -94,7 +94,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -166,7 +166,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: status');
     }
 
-    final path = '/pet/findByStatus';
+    final path = r'/pet/findByStatus';
 
     Object postBody;
 
@@ -225,7 +225,7 @@ class PetApi {
         .cast<Pet>()
         .toList(growable: false);
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Finds Pets by tags
@@ -244,7 +244,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: tags');
     }
 
-    final path = '/pet/findByTags';
+    final path = r'/pet/findByTags';
 
     Object postBody;
 
@@ -303,7 +303,7 @@ class PetApi {
         .cast<Pet>()
         .toList(growable: false);
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Find pet by ID
@@ -322,7 +322,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -377,8 +377,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
-    }
-    return null;
+        }
+    return Future<Pet>.value(null);
   }
 
   /// Update an existing pet
@@ -395,7 +395,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = body;
 
@@ -464,7 +464,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -554,7 +554,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}/uploadImage'
+    final path = r'/pet/{petId}/uploadImage'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -625,7 +625,7 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
-    }
-    return null;
+        }
+    return Future<ApiResponse>.value(null);
   }
 }
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
index 1f20bf42f74b..490860ed8c2f 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
@@ -31,7 +31,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{orderId}'
+    final path = r'/store/order/{orderId}'
       .replaceAll('{' + 'orderId' + '}', orderId.toString());
 
     Object postBody;
@@ -89,7 +89,7 @@ class StoreApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getInventoryWithHttpInfo() async {
-    final path = '/store/inventory';
+    final path = r'/store/inventory';
 
     Object postBody;
 
@@ -139,7 +139,7 @@ class StoreApi {
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
     }
-    return null;
+    return Future<Map<String, int>>.value(null);
   }
 
   /// Find purchase order by ID
@@ -158,7 +158,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{orderId}'
+    final path = r'/store/order/{orderId}'
       .replaceAll('{' + 'orderId' + '}', orderId.toString());
 
     Object postBody;
@@ -213,8 +213,8 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 
   /// Place an order for a pet
@@ -231,7 +231,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/store/order';
+    final path = r'/store/order';
 
     Object postBody = body;
 
@@ -283,7 +283,7 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 }
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
index a8a566239ca7..f643e2e5dabf 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
@@ -31,7 +31,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/user';
+    final path = r'/user';
 
     Object postBody = body;
 
@@ -96,7 +96,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/user/createWithArray';
+    final path = r'/user/createWithArray';
 
     Object postBody = body;
 
@@ -159,7 +159,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/user/createWithList';
+    final path = r'/user/createWithList';
 
     Object postBody = body;
 
@@ -224,7 +224,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -290,7 +290,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -343,8 +343,8 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
-    }
-    return null;
+        }
+    return Future<User>.value(null);
   }
 
   /// Logs user into the system
@@ -367,7 +367,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: password');
     }
 
-    final path = '/user/login';
+    final path = r'/user/login';
 
     Object postBody;
 
@@ -425,15 +425,15 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
-    }
-    return null;
+        }
+    return Future<String>.value(null);
   }
 
   /// Logs out current logged in user session
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> logoutUserWithHttpInfo() async {
-    final path = '/user/logout';
+    final path = r'/user/logout';
 
     Object postBody;
 
@@ -499,7 +499,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: body');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody = body;
diff --git a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
index 9f875dba12d6..87a7a36d470b 100644
--- a/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
+++ b/samples/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
@@ -49,17 +49,6 @@ class ApiClient {
   Map<String, Authentication> get authentications =>
       Map.unmodifiable(_authentications);
 
-  dynamic deserialize(String json, String targetType, {bool growable}) {
-    // Remove all spaces.  Necessary for reg expressions as well.
-    targetType = targetType.replaceAll(' ', '');
-
-    return targetType == 'String'
-      ? json
-      : _deserialize(jsonDecode(json), targetType, growable: true == growable);
-  }
-
-  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
-
   T getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
@@ -209,6 +198,17 @@ class ApiClient {
     throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);
   }
 
+  dynamic deserialize(String json, String targetType, {bool growable}) {
+    // Remove all spaces.  Necessary for reg expressions as well.
+    targetType = targetType.replaceAll(' ', '');
+
+  return targetType == 'String'
+    ? json
+    : _deserialize(jsonDecode(json), targetType, growable: true == growable);
+  }
+
+  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
+
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
   void _updateParamsForAuth(
diff --git a/samples/client/petstore/elixir/.openapi-generator/FILES b/samples/client/petstore/elixir/.openapi-generator/FILES
index a7de9eecd584..cbdb6e35ee98 100644
--- a/samples/client/petstore/elixir/.openapi-generator/FILES
+++ b/samples/client/petstore/elixir/.openapi-generator/FILES
@@ -48,6 +48,7 @@ lib/openapi_petstore/model/outer_enum.ex
 lib/openapi_petstore/model/outer_enum_default_value.ex
 lib/openapi_petstore/model/outer_enum_integer.ex
 lib/openapi_petstore/model/outer_enum_integer_default_value.ex
+lib/openapi_petstore/model/outer_object_with_enum_property.ex
 lib/openapi_petstore/model/pet.ex
 lib/openapi_petstore/model/read_only_first.ex
 lib/openapi_petstore/model/return.ex
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
index b0f0c05e573d..7d05057b3a62 100644
--- a/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/api/fake.ex
@@ -188,6 +188,32 @@ defmodule OpenapiPetstore.Api.Fake do
     ])
   end
 
+  @doc """
+  Test serialization of enum (int) properties with examples
+
+  ## Parameters
+
+  - connection (OpenapiPetstore.Connection): Connection to server
+  - outer_object_with_enum_property (OuterObjectWithEnumProperty): Input enum (int) as post body
+  - opts (KeywordList): [optional] Optional parameters
+  ## Returns
+
+  {:ok, OpenapiPetstore.Model.OuterObjectWithEnumProperty.t} on success
+  {:error, Tesla.Env.t} on failure
+  """
+  @spec fake_property_enum_integer_serialize(Tesla.Env.client, OpenapiPetstore.Model.OuterObjectWithEnumProperty.t, keyword()) :: {:ok, OpenapiPetstore.Model.OuterObjectWithEnumProperty.t} | {:error, Tesla.Env.t}
+  def fake_property_enum_integer_serialize(connection, outer_object_with_enum_property, _opts \\ []) do
+    %{}
+    |> method(:post)
+    |> url("/fake/property/enum-int")
+    |> add_param(:body, :body, outer_object_with_enum_property)
+    |> Enum.into([])
+    |> (&Connection.request(connection, &1)).()
+    |> evaluate_response([
+      { 200, %OpenapiPetstore.Model.OuterObjectWithEnumProperty{}}
+    ])
+  end
+
   @doc """
   For this test, the body for this request much reference a schema named `File`.
 
diff --git a/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex
new file mode 100644
index 000000000000..2eed9a6dfa4c
--- /dev/null
+++ b/samples/client/petstore/elixir/lib/openapi_petstore/model/outer_object_with_enum_property.ex
@@ -0,0 +1,27 @@
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+# https://openapi-generator.tech
+# Do not edit the class manually.
+
+defmodule OpenapiPetstore.Model.OuterObjectWithEnumProperty do
+  @moduledoc """
+  
+  """
+
+  @derive [Poison.Encoder]
+  defstruct [
+    :"value"
+  ]
+
+  @type t :: %__MODULE__{
+    :"value" => OpenapiPetstore.Model.OuterEnumInteger.t
+  }
+end
+
+defimpl Poison.Decoder, for: OpenapiPetstore.Model.OuterObjectWithEnumProperty do
+  import OpenapiPetstore.Deserializer
+  def decode(value, options) do
+    value
+    |> deserialize(:"value", :struct, OpenapiPetstore.Model.OuterEnumInteger, options)
+  end
+end
+
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/api/ApiUtils.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/api/ApiUtils.groovy
new file mode 100644
index 000000000000..c1fe94b1027c
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/api/ApiUtils.groovy
@@ -0,0 +1,54 @@
+package org.openapitools.api
+
+import static groovyx.net.http.HttpBuilder.configure
+import static java.net.URI.create
+
+class ApiUtils {
+
+    void invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType, method, container, type)  {
+        def (url, uriPath) = buildUrlAndUriPath(basePath, versionPath, resourcePath)
+        println "url=$url uriPath=$uriPath"
+        def http = configure {
+            request.uri = url
+            request.uri.path = uriPath
+        }
+        .invokeMethod(String.valueOf(method).toLowerCase()) {
+            request.uri.query = queryParams
+            request.headers = headerParams
+            if (bodyParams != null) {
+                request.body = bodyParams
+            }
+            request.contentType = contentType
+
+            response.success { resp, json ->
+                if (type != null) {
+                    onSuccess(parse(json, container, type))
+                }
+            }
+            response.failure { resp ->
+                onFailure(resp.statusCode, resp.message)
+            }
+        }
+
+    }
+
+    private static def buildUrlAndUriPath(basePath, versionPath, resourcePath) {
+        // HTTPBuilder expects to get as its constructor parameter an URL,
+        // without any other additions like path, therefore we need to cut the path
+        // from the basePath as it is represented by swagger APIs
+        // we use java.net.URI to manipulate the basePath
+        // then the uriPath will hold the rest of the path
+        URI baseUri =  create(basePath)
+        def pathOnly = baseUri.getPath()
+        [basePath-pathOnly, pathOnly+versionPath+resourcePath]
+    }
+
+    private def parse(object, container, clazz) {
+        if (container == "array") {
+            return object.collect {parse(it, "", clazz)}
+        }   else {
+            return clazz.newInstance(object)
+        }
+    }
+
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/api/PetApi.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/api/PetApi.groovy
new file mode 100644
index 000000000000..d448cfd544ea
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/api/PetApi.groovy
@@ -0,0 +1,225 @@
+package org.openapitools.api;
+
+import org.openapitools.api.ApiUtils
+import org.openapitools.model.ModelApiResponse
+import org.openapitools.model.Pet
+
+class PetApi {
+    String basePath = "http://petstore.swagger.io/v2"
+    String versionPath = ""
+    ApiUtils apiUtils = new ApiUtils();
+
+    def addPet ( Pet pet, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (pet == null) {
+            throw new RuntimeException("missing required params pet")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = pet
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    Pet.class )
+
+    }
+
+    def deletePet ( Long petId, String apiKey, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/${petId}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (petId == null) {
+            throw new RuntimeException("missing required params petId")
+        }
+
+
+        if (apiKey != null) {
+            headerParams.put("api_key", apiKey)
+        }
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "DELETE", "",
+                    null )
+
+    }
+
+    def findPetsByStatus ( List<String> status, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/findByStatus"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (status == null) {
+            throw new RuntimeException("missing required params status")
+        }
+
+        if (status != null) {
+            queryParams.put("status", status)
+        }
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "array",
+                    Pet.class )
+
+    }
+
+    def findPetsByTags ( List<String> tags, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/findByTags"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (tags == null) {
+            throw new RuntimeException("missing required params tags")
+        }
+
+        if (tags != null) {
+            queryParams.put("tags", tags)
+        }
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "array",
+                    Pet.class )
+
+    }
+
+    def getPetById ( Long petId, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/${petId}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (petId == null) {
+            throw new RuntimeException("missing required params petId")
+        }
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "",
+                    Pet.class )
+
+    }
+
+    def updatePet ( Pet pet, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (pet == null) {
+            throw new RuntimeException("missing required params pet")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = pet
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "PUT", "",
+                    Pet.class )
+
+    }
+
+    def updatePetWithForm ( Long petId, String name, String status, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/${petId}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (petId == null) {
+            throw new RuntimeException("missing required params petId")
+        }
+
+
+
+
+        contentType = 'application/x-www-form-urlencoded';
+        bodyParams = [:]
+        bodyParams.put("name", name)
+        bodyParams.put("status", status)
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    null )
+
+    }
+
+    def uploadFile ( Long petId, String additionalMetadata, File file, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/pet/${petId}/uploadImage"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (petId == null) {
+            throw new RuntimeException("missing required params petId")
+        }
+
+
+
+
+        contentType = 'multipart/form-data';
+        bodyParams = [:]
+        bodyParams.put("additionalMetadata", additionalMetadata)
+        bodyParams.put("file", file)
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    ModelApiResponse.class )
+
+    }
+
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/api/StoreApi.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/api/StoreApi.groovy
new file mode 100644
index 000000000000..319a6ddcaf88
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/api/StoreApi.groovy
@@ -0,0 +1,105 @@
+package org.openapitools.api;
+
+import org.openapitools.api.ApiUtils
+import org.openapitools.model.Order
+
+class StoreApi {
+    String basePath = "http://petstore.swagger.io/v2"
+    String versionPath = ""
+    ApiUtils apiUtils = new ApiUtils();
+
+    def deleteOrder ( String orderId, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/store/order/${orderId}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (orderId == null) {
+            throw new RuntimeException("missing required params orderId")
+        }
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "DELETE", "",
+                    null )
+
+    }
+
+    def getInventory ( Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/store/inventory"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "map",
+                    Integer.class )
+
+    }
+
+    def getOrderById ( Long orderId, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/store/order/${orderId}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (orderId == null) {
+            throw new RuntimeException("missing required params orderId")
+        }
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "",
+                    Order.class )
+
+    }
+
+    def placeOrder ( Order order, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/store/order"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (order == null) {
+            throw new RuntimeException("missing required params order")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = order
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    Order.class )
+
+    }
+
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/api/UserApi.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/api/UserApi.groovy
new file mode 100644
index 000000000000..82be73e27bcb
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/api/UserApi.groovy
@@ -0,0 +1,222 @@
+package org.openapitools.api;
+
+import org.openapitools.api.ApiUtils
+import java.util.List
+import org.openapitools.model.User
+
+class UserApi {
+    String basePath = "http://petstore.swagger.io/v2"
+    String versionPath = ""
+    ApiUtils apiUtils = new ApiUtils();
+
+    def createUser ( User user, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (user == null) {
+            throw new RuntimeException("missing required params user")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = user
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    null )
+
+    }
+
+    def createUsersWithArrayInput ( List<User> user, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/createWithArray"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (user == null) {
+            throw new RuntimeException("missing required params user")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = user
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    null )
+
+    }
+
+    def createUsersWithListInput ( List<User> user, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/createWithList"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (user == null) {
+            throw new RuntimeException("missing required params user")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = user
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "POST", "",
+                    null )
+
+    }
+
+    def deleteUser ( String username, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/${username}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (username == null) {
+            throw new RuntimeException("missing required params username")
+        }
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "DELETE", "",
+                    null )
+
+    }
+
+    def getUserByName ( String username, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/${username}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (username == null) {
+            throw new RuntimeException("missing required params username")
+        }
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "",
+                    User.class )
+
+    }
+
+    def loginUser ( String username, String password, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/login"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (username == null) {
+            throw new RuntimeException("missing required params username")
+        }
+        // verify required params are set
+        if (password == null) {
+            throw new RuntimeException("missing required params password")
+        }
+
+        if (username != null) {
+            queryParams.put("username", username)
+        }
+        if (password != null) {
+            queryParams.put("password", password)
+        }
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "",
+                    String.class )
+
+    }
+
+    def logoutUser ( Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/logout"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+
+
+
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "GET", "",
+                    null )
+
+    }
+
+    def updateUser ( String username, User user, Closure onSuccess, Closure onFailure)  {
+        String resourcePath = "/user/${username}"
+
+        // params
+        def queryParams = [:]
+        def headerParams = [:]
+        def bodyParams
+        def contentType
+
+        // verify required params are set
+        if (username == null) {
+            throw new RuntimeException("missing required params username")
+        }
+        // verify required params are set
+        if (user == null) {
+            throw new RuntimeException("missing required params user")
+        }
+
+
+
+        contentType = 'application/json';
+        bodyParams = user
+
+
+        apiUtils.invokeApi(onSuccess, onFailure, basePath, versionPath, resourcePath, queryParams, headerParams, bodyParams, contentType,
+                    "PUT", "",
+                    null )
+
+    }
+
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/Category.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Category.groovy
new file mode 100644
index 000000000000..d8ccf48a82aa
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Category.groovy
@@ -0,0 +1,13 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@Canonical
+class Category {
+    
+    Long id
+    
+    String name
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/ModelApiResponse.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/ModelApiResponse.groovy
new file mode 100644
index 000000000000..468841ffff37
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/ModelApiResponse.groovy
@@ -0,0 +1,15 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@Canonical
+class ModelApiResponse {
+    
+    Integer code
+    
+    String type
+    
+    String message
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/Order.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Order.groovy
new file mode 100644
index 000000000000..d9e02f8a6cc8
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Order.groovy
@@ -0,0 +1,21 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@Canonical
+class Order {
+    
+    Long id
+    
+    Long petId
+    
+    Integer quantity
+    
+    Date shipDate
+    /* Order Status */
+    String status
+    
+    Boolean complete = false
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/Pet.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Pet.groovy
new file mode 100644
index 000000000000..630c015aaa4e
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Pet.groovy
@@ -0,0 +1,25 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.model.Category;
+import org.openapitools.model.Tag;
+
+@Canonical
+class Pet {
+    
+    Long id
+    
+    Category category
+    
+    String name
+    
+    List<String> photoUrls = new ArrayList<String>()
+    
+    List<Tag> tags = new ArrayList<Tag>()
+    /* pet status in the store */
+    String status
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/Tag.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Tag.groovy
new file mode 100644
index 000000000000..a704bc5ffef0
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/Tag.groovy
@@ -0,0 +1,13 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@Canonical
+class Tag {
+    
+    Long id
+    
+    String name
+}
diff --git a/samples/client/petstore/groovy/bin/main/org/openapitools/model/User.groovy b/samples/client/petstore/groovy/bin/main/org/openapitools/model/User.groovy
new file mode 100644
index 000000000000..a6f850e87543
--- /dev/null
+++ b/samples/client/petstore/groovy/bin/main/org/openapitools/model/User.groovy
@@ -0,0 +1,25 @@
+package org.openapitools.model;
+
+import groovy.transform.Canonical
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+@Canonical
+class User {
+    
+    Long id
+    
+    String username
+    
+    String firstName
+    
+    String lastName
+    
+    String email
+    
+    String password
+    
+    String phone
+    /* User Status */
+    Integer userStatus
+}
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/google-api-client/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Animal.md b/samples/client/petstore/java/google-api-client/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/google-api-client/docs/Animal.md
+++ b/samples/client/petstore/java/google-api-client/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md b/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/google-api-client/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/google-api-client/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/google-api-client/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/google-api-client/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/google-api-client/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/google-api-client/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/ArrayTest.md b/samples/client/petstore/java/google-api-client/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/google-api-client/docs/ArrayTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/BigCat.md b/samples/client/petstore/java/google-api-client/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/google-api-client/docs/BigCat.md
+++ b/samples/client/petstore/java/google-api-client/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/BigCatAllOf.md b/samples/client/petstore/java/google-api-client/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/google-api-client/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/google-api-client/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Capitalization.md b/samples/client/petstore/java/google-api-client/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/google-api-client/docs/Capitalization.md
+++ b/samples/client/petstore/java/google-api-client/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Cat.md b/samples/client/petstore/java/google-api-client/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/google-api-client/docs/Cat.md
+++ b/samples/client/petstore/java/google-api-client/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/CatAllOf.md b/samples/client/petstore/java/google-api-client/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/google-api-client/docs/CatAllOf.md
+++ b/samples/client/petstore/java/google-api-client/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Category.md b/samples/client/petstore/java/google-api-client/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/google-api-client/docs/Category.md
+++ b/samples/client/petstore/java/google-api-client/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/ClassModel.md b/samples/client/petstore/java/google-api-client/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/google-api-client/docs/ClassModel.md
+++ b/samples/client/petstore/java/google-api-client/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Client.md b/samples/client/petstore/java/google-api-client/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/google-api-client/docs/Client.md
+++ b/samples/client/petstore/java/google-api-client/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Dog.md b/samples/client/petstore/java/google-api-client/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/google-api-client/docs/Dog.md
+++ b/samples/client/petstore/java/google-api-client/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/DogAllOf.md b/samples/client/petstore/java/google-api-client/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/google-api-client/docs/DogAllOf.md
+++ b/samples/client/petstore/java/google-api-client/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/EnumArrays.md b/samples/client/petstore/java/google-api-client/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/google-api-client/docs/EnumArrays.md
+++ b/samples/client/petstore/java/google-api-client/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/EnumTest.md b/samples/client/petstore/java/google-api-client/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/google-api-client/docs/EnumTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/FakeApi.md b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/google-api-client/docs/FakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/FileSchemaTestClass.md b/samples/client/petstore/java/google-api-client/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/google-api-client/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/google-api-client/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/FormatTest.md b/samples/client/petstore/java/google-api-client/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/google-api-client/docs/FormatTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/google-api-client/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/google-api-client/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/google-api-client/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/MapTest.md b/samples/client/petstore/java/google-api-client/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/google-api-client/docs/MapTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Model200Response.md b/samples/client/petstore/java/google-api-client/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/google-api-client/docs/Model200Response.md
+++ b/samples/client/petstore/java/google-api-client/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/ModelApiResponse.md b/samples/client/petstore/java/google-api-client/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/google-api-client/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/google-api-client/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/ModelReturn.md b/samples/client/petstore/java/google-api-client/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/google-api-client/docs/ModelReturn.md
+++ b/samples/client/petstore/java/google-api-client/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Name.md b/samples/client/petstore/java/google-api-client/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/google-api-client/docs/Name.md
+++ b/samples/client/petstore/java/google-api-client/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/NumberOnly.md b/samples/client/petstore/java/google-api-client/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/google-api-client/docs/NumberOnly.md
+++ b/samples/client/petstore/java/google-api-client/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Order.md b/samples/client/petstore/java/google-api-client/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/google-api-client/docs/Order.md
+++ b/samples/client/petstore/java/google-api-client/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/OuterComposite.md b/samples/client/petstore/java/google-api-client/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/google-api-client/docs/OuterComposite.md
+++ b/samples/client/petstore/java/google-api-client/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/Pet.md b/samples/client/petstore/java/google-api-client/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/google-api-client/docs/Pet.md
+++ b/samples/client/petstore/java/google-api-client/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/PetApi.md b/samples/client/petstore/java/google-api-client/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/google-api-client/docs/PetApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/ReadOnlyFirst.md b/samples/client/petstore/java/google-api-client/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/google-api-client/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/google-api-client/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md b/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/google-api-client/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/StoreApi.md b/samples/client/petstore/java/google-api-client/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/google-api-client/docs/StoreApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/Tag.md b/samples/client/petstore/java/google-api-client/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/google-api-client/docs/Tag.md
+++ b/samples/client/petstore/java/google-api-client/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/TypeHolderDefault.md b/samples/client/petstore/java/google-api-client/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/google-api-client/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/google-api-client/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/TypeHolderExample.md b/samples/client/petstore/java/google-api-client/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/google-api-client/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/google-api-client/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/User.md b/samples/client/petstore/java/google-api-client/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/google-api-client/docs/User.md
+++ b/samples/client/petstore/java/google-api-client/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/google-api-client/docs/UserApi.md b/samples/client/petstore/java/google-api-client/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/google-api-client/docs/UserApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/google-api-client/docs/XmlItem.md b/samples/client/petstore/java/google-api-client/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/google-api-client/docs/XmlItem.md
+++ b/samples/client/petstore/java/google-api-client/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/jersey1/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Animal.md b/samples/client/petstore/java/jersey1/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/jersey1/docs/Animal.md
+++ b/samples/client/petstore/java/jersey1/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/AnotherFakeApi.md b/samples/client/petstore/java/jersey1/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/jersey1/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/jersey1/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/jersey1/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/jersey1/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey1/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/jersey1/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/jersey1/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey1/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/ArrayTest.md b/samples/client/petstore/java/jersey1/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/jersey1/docs/ArrayTest.md
+++ b/samples/client/petstore/java/jersey1/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/BigCat.md b/samples/client/petstore/java/jersey1/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/jersey1/docs/BigCat.md
+++ b/samples/client/petstore/java/jersey1/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/BigCatAllOf.md b/samples/client/petstore/java/jersey1/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/jersey1/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/jersey1/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Capitalization.md b/samples/client/petstore/java/jersey1/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/jersey1/docs/Capitalization.md
+++ b/samples/client/petstore/java/jersey1/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Cat.md b/samples/client/petstore/java/jersey1/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/jersey1/docs/Cat.md
+++ b/samples/client/petstore/java/jersey1/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/CatAllOf.md b/samples/client/petstore/java/jersey1/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/jersey1/docs/CatAllOf.md
+++ b/samples/client/petstore/java/jersey1/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Category.md b/samples/client/petstore/java/jersey1/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/jersey1/docs/Category.md
+++ b/samples/client/petstore/java/jersey1/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/ClassModel.md b/samples/client/petstore/java/jersey1/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/jersey1/docs/ClassModel.md
+++ b/samples/client/petstore/java/jersey1/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Client.md b/samples/client/petstore/java/jersey1/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/jersey1/docs/Client.md
+++ b/samples/client/petstore/java/jersey1/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Dog.md b/samples/client/petstore/java/jersey1/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/jersey1/docs/Dog.md
+++ b/samples/client/petstore/java/jersey1/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/DogAllOf.md b/samples/client/petstore/java/jersey1/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/jersey1/docs/DogAllOf.md
+++ b/samples/client/petstore/java/jersey1/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/EnumArrays.md b/samples/client/petstore/java/jersey1/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/jersey1/docs/EnumArrays.md
+++ b/samples/client/petstore/java/jersey1/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/EnumTest.md b/samples/client/petstore/java/jersey1/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/jersey1/docs/EnumTest.md
+++ b/samples/client/petstore/java/jersey1/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/FakeApi.md b/samples/client/petstore/java/jersey1/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/jersey1/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey1/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/jersey1/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/jersey1/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/jersey1/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/FileSchemaTestClass.md b/samples/client/petstore/java/jersey1/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/jersey1/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/jersey1/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/FormatTest.md b/samples/client/petstore/java/jersey1/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/jersey1/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey1/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/jersey1/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/jersey1/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/jersey1/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/MapTest.md b/samples/client/petstore/java/jersey1/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/jersey1/docs/MapTest.md
+++ b/samples/client/petstore/java/jersey1/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey1/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Model200Response.md b/samples/client/petstore/java/jersey1/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/jersey1/docs/Model200Response.md
+++ b/samples/client/petstore/java/jersey1/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/ModelApiResponse.md b/samples/client/petstore/java/jersey1/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/jersey1/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/jersey1/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/ModelReturn.md b/samples/client/petstore/java/jersey1/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/jersey1/docs/ModelReturn.md
+++ b/samples/client/petstore/java/jersey1/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Name.md b/samples/client/petstore/java/jersey1/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/jersey1/docs/Name.md
+++ b/samples/client/petstore/java/jersey1/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/NumberOnly.md b/samples/client/petstore/java/jersey1/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/jersey1/docs/NumberOnly.md
+++ b/samples/client/petstore/java/jersey1/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Order.md b/samples/client/petstore/java/jersey1/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/jersey1/docs/Order.md
+++ b/samples/client/petstore/java/jersey1/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/OuterComposite.md b/samples/client/petstore/java/jersey1/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/jersey1/docs/OuterComposite.md
+++ b/samples/client/petstore/java/jersey1/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/Pet.md b/samples/client/petstore/java/jersey1/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/jersey1/docs/Pet.md
+++ b/samples/client/petstore/java/jersey1/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/PetApi.md b/samples/client/petstore/java/jersey1/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/jersey1/docs/PetApi.md
+++ b/samples/client/petstore/java/jersey1/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/ReadOnlyFirst.md b/samples/client/petstore/java/jersey1/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/jersey1/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/jersey1/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/SpecialModelName.md b/samples/client/petstore/java/jersey1/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/jersey1/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/jersey1/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/StoreApi.md b/samples/client/petstore/java/jersey1/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/jersey1/docs/StoreApi.md
+++ b/samples/client/petstore/java/jersey1/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/Tag.md b/samples/client/petstore/java/jersey1/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/jersey1/docs/Tag.md
+++ b/samples/client/petstore/java/jersey1/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/TypeHolderDefault.md b/samples/client/petstore/java/jersey1/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/jersey1/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/jersey1/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/TypeHolderExample.md b/samples/client/petstore/java/jersey1/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/jersey1/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/jersey1/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/User.md b/samples/client/petstore/java/jersey1/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/jersey1/docs/User.md
+++ b/samples/client/petstore/java/jersey1/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey1/docs/UserApi.md b/samples/client/petstore/java/jersey1/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/jersey1/docs/UserApi.md
+++ b/samples/client/petstore/java/jersey1/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/jersey1/docs/XmlItem.md b/samples/client/petstore/java/jersey1/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/jersey1/docs/XmlItem.md
+++ b/samples/client/petstore/java/jersey1/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Animal.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Animal.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayTest.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCat.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCat.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCatAllOf.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Capitalization.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Capitalization.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Cat.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Cat.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/CatAllOf.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/CatAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Category.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Category.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ClassModel.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ClassModel.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Client.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Client.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Dog.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Dog.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/DogAllOf.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/DogAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumArrays.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumArrays.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumTest.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FileSchemaTestClass.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
index 119bcdc97e85..1fcee404010f 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MapTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MapTest.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 7d124d8969a3..2c3dd709622a 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Model200Response.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Model200Response.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelApiResponse.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelReturn.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelReturn.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Name.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Name.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/NumberOnly.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/NumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Order.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Order.md
index c002f5a36153..ff107e8d7ebc 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Order.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/OuterComposite.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/OuterComposite.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Pet.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Pet.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ReadOnlyFirst.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/SpecialModelName.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Tag.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Tag.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderDefault.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderExample.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/User.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/User.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/XmlItem.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/XmlItem.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Animal.md b/samples/client/petstore/java/jersey2-java8/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Animal.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ArrayTest.md b/samples/client/petstore/java/jersey2-java8/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ArrayTest.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/BigCat.md b/samples/client/petstore/java/jersey2-java8/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/BigCat.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/BigCatAllOf.md b/samples/client/petstore/java/jersey2-java8/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Capitalization.md b/samples/client/petstore/java/jersey2-java8/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Capitalization.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Cat.md b/samples/client/petstore/java/jersey2-java8/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Cat.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/CatAllOf.md b/samples/client/petstore/java/jersey2-java8/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/CatAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Category.md b/samples/client/petstore/java/jersey2-java8/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Category.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ClassModel.md b/samples/client/petstore/java/jersey2-java8/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ClassModel.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Client.md b/samples/client/petstore/java/jersey2-java8/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Client.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Dog.md b/samples/client/petstore/java/jersey2-java8/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Dog.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/DogAllOf.md b/samples/client/petstore/java/jersey2-java8/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/DogAllOf.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/EnumArrays.md b/samples/client/petstore/java/jersey2-java8/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/EnumArrays.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/EnumTest.md b/samples/client/petstore/java/jersey2-java8/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/EnumTest.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md b/samples/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/MapTest.md b/samples/client/petstore/java/jersey2-java8/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/MapTest.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Model200Response.md b/samples/client/petstore/java/jersey2-java8/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Model200Response.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md b/samples/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ModelReturn.md b/samples/client/petstore/java/jersey2-java8/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ModelReturn.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Name.md b/samples/client/petstore/java/jersey2-java8/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Name.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/NumberOnly.md b/samples/client/petstore/java/jersey2-java8/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/NumberOnly.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Order.md b/samples/client/petstore/java/jersey2-java8/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Order.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/OuterComposite.md b/samples/client/petstore/java/jersey2-java8/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/OuterComposite.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Pet.md b/samples/client/petstore/java/jersey2-java8/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Pet.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md b/samples/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/SpecialModelName.md b/samples/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/Tag.md b/samples/client/petstore/java/jersey2-java8/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/Tag.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/TypeHolderDefault.md b/samples/client/petstore/java/jersey2-java8/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/TypeHolderExample.md b/samples/client/petstore/java/jersey2-java8/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/User.md b/samples/client/petstore/java/jersey2-java8/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/User.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/jersey2-java8/docs/XmlItem.md b/samples/client/petstore/java/jersey2-java8/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/XmlItem.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Category.md b/samples/client/petstore/java/microprofile-rest-client/docs/Category.md
index eac8fab40f3e..6f5421307d51 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Category.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Category.md
@@ -3,6 +3,7 @@
 # Category
 
 A category for a pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/ModelApiResponse.md b/samples/client/petstore/java/microprofile-rest-client/docs/ModelApiResponse.md
index aaf138e7ff79..113ba95b7085 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/ModelApiResponse.md
@@ -3,6 +3,7 @@
 # ModelApiResponse
 
 Describes the result of uploading an image resource
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
index dd72cd9bdc35..cefaaf5b4d20 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Order.md
@@ -3,6 +3,7 @@
 # Order
 
 An order for a pets from the pet store
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Pet.md b/samples/client/petstore/java/microprofile-rest-client/docs/Pet.md
index a2664e601e87..2ab4d8c7fe7b 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Pet.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Pet.md
@@ -3,6 +3,7 @@
 # Pet
 
 A pet for sale in the pet store
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/PetApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/PetApi.md
index 3e784666f136..60b9920b9b26 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/PetApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/PetApi.md
@@ -77,6 +77,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -217,6 +219,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -288,6 +291,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -361,6 +365,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
index f43fc7d76fe2..da0b458210a5 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/StoreApi.md
@@ -70,6 +70,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -139,6 +140,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -204,6 +206,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -269,6 +272,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/Tag.md b/samples/client/petstore/java/microprofile-rest-client/docs/Tag.md
index 58beb5e14ecd..ae6756ef3935 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/Tag.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/Tag.md
@@ -3,6 +3,7 @@
 # Tag
 
 A tag for a pet
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/User.md b/samples/client/petstore/java/microprofile-rest-client/docs/User.md
index d34ff1a4d89b..22968c797bfd 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/User.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/User.md
@@ -3,6 +3,7 @@
 # User
 
 A User who is purchasing from the pet store
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/microprofile-rest-client/docs/UserApi.md b/samples/client/petstore/java/microprofile-rest-client/docs/UserApi.md
index 891af2578894..eac383c5d118 100644
--- a/samples/client/petstore/java/microprofile-rest-client/docs/UserApi.md
+++ b/samples/client/petstore/java/microprofile-rest-client/docs/UserApi.md
@@ -74,6 +74,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -137,6 +138,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -200,6 +202,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -265,6 +268,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -329,6 +333,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -396,6 +401,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -456,6 +462,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -523,6 +530,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/native-async/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/native-async/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Animal.md b/samples/client/petstore/java/native-async/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/native-async/docs/Animal.md
+++ b/samples/client/petstore/java/native-async/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/native-async/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/native-async/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/native-async/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/native-async/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/native-async/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/native-async/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ArrayTest.md b/samples/client/petstore/java/native-async/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/native-async/docs/ArrayTest.md
+++ b/samples/client/petstore/java/native-async/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/BigCat.md b/samples/client/petstore/java/native-async/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/native-async/docs/BigCat.md
+++ b/samples/client/petstore/java/native-async/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/BigCatAllOf.md b/samples/client/petstore/java/native-async/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/native-async/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/native-async/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Capitalization.md b/samples/client/petstore/java/native-async/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/native-async/docs/Capitalization.md
+++ b/samples/client/petstore/java/native-async/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Cat.md b/samples/client/petstore/java/native-async/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/native-async/docs/Cat.md
+++ b/samples/client/petstore/java/native-async/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/CatAllOf.md b/samples/client/petstore/java/native-async/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/native-async/docs/CatAllOf.md
+++ b/samples/client/petstore/java/native-async/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Category.md b/samples/client/petstore/java/native-async/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/native-async/docs/Category.md
+++ b/samples/client/petstore/java/native-async/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ClassModel.md b/samples/client/petstore/java/native-async/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/native-async/docs/ClassModel.md
+++ b/samples/client/petstore/java/native-async/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Client.md b/samples/client/petstore/java/native-async/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/native-async/docs/Client.md
+++ b/samples/client/petstore/java/native-async/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Dog.md b/samples/client/petstore/java/native-async/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/native-async/docs/Dog.md
+++ b/samples/client/petstore/java/native-async/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/DogAllOf.md b/samples/client/petstore/java/native-async/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/native-async/docs/DogAllOf.md
+++ b/samples/client/petstore/java/native-async/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/EnumArrays.md b/samples/client/petstore/java/native-async/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/native-async/docs/EnumArrays.md
+++ b/samples/client/petstore/java/native-async/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/EnumTest.md b/samples/client/petstore/java/native-async/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/native-async/docs/EnumTest.md
+++ b/samples/client/petstore/java/native-async/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/FileSchemaTestClass.md b/samples/client/petstore/java/native-async/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/native-async/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/native-async/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/FormatTest.md b/samples/client/petstore/java/native-async/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/native-async/docs/FormatTest.md
+++ b/samples/client/petstore/java/native-async/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/native-async/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/native-async/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/native-async/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/MapTest.md b/samples/client/petstore/java/native-async/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/native-async/docs/MapTest.md
+++ b/samples/client/petstore/java/native-async/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Model200Response.md b/samples/client/petstore/java/native-async/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/native-async/docs/Model200Response.md
+++ b/samples/client/petstore/java/native-async/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ModelApiResponse.md b/samples/client/petstore/java/native-async/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/native-async/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/native-async/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ModelReturn.md b/samples/client/petstore/java/native-async/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/native-async/docs/ModelReturn.md
+++ b/samples/client/petstore/java/native-async/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Name.md b/samples/client/petstore/java/native-async/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/native-async/docs/Name.md
+++ b/samples/client/petstore/java/native-async/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/NumberOnly.md b/samples/client/petstore/java/native-async/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/native-async/docs/NumberOnly.md
+++ b/samples/client/petstore/java/native-async/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Order.md b/samples/client/petstore/java/native-async/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/native-async/docs/Order.md
+++ b/samples/client/petstore/java/native-async/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/OuterComposite.md b/samples/client/petstore/java/native-async/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/native-async/docs/OuterComposite.md
+++ b/samples/client/petstore/java/native-async/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Pet.md b/samples/client/petstore/java/native-async/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/native-async/docs/Pet.md
+++ b/samples/client/petstore/java/native-async/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/ReadOnlyFirst.md b/samples/client/petstore/java/native-async/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/native-async/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/native-async/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/SpecialModelName.md b/samples/client/petstore/java/native-async/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/native-async/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/native-async/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/Tag.md b/samples/client/petstore/java/native-async/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/native-async/docs/Tag.md
+++ b/samples/client/petstore/java/native-async/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/TypeHolderDefault.md b/samples/client/petstore/java/native-async/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/native-async/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/native-async/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/TypeHolderExample.md b/samples/client/petstore/java/native-async/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/native-async/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/native-async/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/User.md b/samples/client/petstore/java/native-async/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/native-async/docs/User.md
+++ b/samples/client/petstore/java/native-async/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native-async/docs/XmlItem.md b/samples/client/petstore/java/native-async/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/native-async/docs/XmlItem.md
+++ b/samples/client/petstore/java/native-async/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Animal.md b/samples/client/petstore/java/native/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/native/docs/Animal.md
+++ b/samples/client/petstore/java/native/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ArrayTest.md b/samples/client/petstore/java/native/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/native/docs/ArrayTest.md
+++ b/samples/client/petstore/java/native/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/BigCat.md b/samples/client/petstore/java/native/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/native/docs/BigCat.md
+++ b/samples/client/petstore/java/native/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/BigCatAllOf.md b/samples/client/petstore/java/native/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/native/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/native/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Capitalization.md b/samples/client/petstore/java/native/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/native/docs/Capitalization.md
+++ b/samples/client/petstore/java/native/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Cat.md b/samples/client/petstore/java/native/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/native/docs/Cat.md
+++ b/samples/client/petstore/java/native/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/CatAllOf.md b/samples/client/petstore/java/native/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/native/docs/CatAllOf.md
+++ b/samples/client/petstore/java/native/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Category.md b/samples/client/petstore/java/native/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/native/docs/Category.md
+++ b/samples/client/petstore/java/native/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ClassModel.md b/samples/client/petstore/java/native/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/native/docs/ClassModel.md
+++ b/samples/client/petstore/java/native/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Client.md b/samples/client/petstore/java/native/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/native/docs/Client.md
+++ b/samples/client/petstore/java/native/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Dog.md b/samples/client/petstore/java/native/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/native/docs/Dog.md
+++ b/samples/client/petstore/java/native/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/DogAllOf.md b/samples/client/petstore/java/native/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/native/docs/DogAllOf.md
+++ b/samples/client/petstore/java/native/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/EnumArrays.md b/samples/client/petstore/java/native/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/native/docs/EnumArrays.md
+++ b/samples/client/petstore/java/native/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/EnumTest.md b/samples/client/petstore/java/native/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/native/docs/EnumTest.md
+++ b/samples/client/petstore/java/native/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/FileSchemaTestClass.md b/samples/client/petstore/java/native/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/native/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/native/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/FormatTest.md b/samples/client/petstore/java/native/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/native/docs/FormatTest.md
+++ b/samples/client/petstore/java/native/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/MapTest.md b/samples/client/petstore/java/native/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/native/docs/MapTest.md
+++ b/samples/client/petstore/java/native/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Model200Response.md b/samples/client/petstore/java/native/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/native/docs/Model200Response.md
+++ b/samples/client/petstore/java/native/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ModelApiResponse.md b/samples/client/petstore/java/native/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/native/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/native/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ModelReturn.md b/samples/client/petstore/java/native/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/native/docs/ModelReturn.md
+++ b/samples/client/petstore/java/native/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Name.md b/samples/client/petstore/java/native/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/native/docs/Name.md
+++ b/samples/client/petstore/java/native/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/NumberOnly.md b/samples/client/petstore/java/native/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/native/docs/NumberOnly.md
+++ b/samples/client/petstore/java/native/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Order.md b/samples/client/petstore/java/native/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/native/docs/Order.md
+++ b/samples/client/petstore/java/native/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/OuterComposite.md b/samples/client/petstore/java/native/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/native/docs/OuterComposite.md
+++ b/samples/client/petstore/java/native/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Pet.md b/samples/client/petstore/java/native/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/native/docs/Pet.md
+++ b/samples/client/petstore/java/native/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/ReadOnlyFirst.md b/samples/client/petstore/java/native/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/native/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/native/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/SpecialModelName.md b/samples/client/petstore/java/native/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/native/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/native/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/Tag.md b/samples/client/petstore/java/native/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/native/docs/Tag.md
+++ b/samples/client/petstore/java/native/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/TypeHolderDefault.md b/samples/client/petstore/java/native/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/native/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/native/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/TypeHolderExample.md b/samples/client/petstore/java/native/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/native/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/native/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/User.md b/samples/client/petstore/java/native/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/native/docs/User.md
+++ b/samples/client/petstore/java/native/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/native/docs/XmlItem.md b/samples/client/petstore/java/native/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/native/docs/XmlItem.md
+++ b/samples/client/petstore/java/native/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Animal.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Animal.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayTest.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCat.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCat.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCatAllOf.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Capitalization.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Capitalization.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Cat.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Cat.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/CatAllOf.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/CatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Category.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Category.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ClassModel.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ClassModel.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Client.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Client.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Dog.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Dog.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/DogAllOf.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/DogAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumArrays.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumArrays.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumTest.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FileSchemaTestClass.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MapTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MapTest.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Model200Response.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Model200Response.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelApiResponse.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelReturn.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelReturn.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Name.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Name.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/NumberOnly.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/NumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Order.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/OuterComposite.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/OuterComposite.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Pet.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Pet.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ReadOnlyFirst.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/SpecialModelName.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Tag.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Tag.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderDefault.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderExample.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/User.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/User.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/XmlItem.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/XmlItem.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
index 34c14b52bf20..8c348eb23069 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
index 6a791da7106a..2e7ed29b2554 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
index 930bfd1a5acf..bfe96e6ffdf1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
index e3b04c897ed2..1b443d6ddff5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
index 7629f5f50c83..c030cc566c5f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
index 6a745f35b635..34583587d639 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
index 060b7bdd6c0b..3377cb6aedf1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
index 5b0385e52a08..715c33fe11ea 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
index cd162bd797de..ebe563535646 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
index e6071b7ac6ad..824460e9b87a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
index 103babddf1be..74eeb0362a2d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
index 1b79b1e97df5..e3af575009ee 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
index eec91a458027..d69b9abe4a2a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
index d4c713b3e96e..e010e0307fde 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
index d7b56a6b99cc..3e27a481387d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
index 7c35c8fdba5c..7595377e38e7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
index c8b100487006..a45e40c7ce8a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
index eaa76f6bb226..24205f7a0435 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
index ede422e87c2f..d4cb7cafb439 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
index 149537224cc5..cff52708e579 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
index ffb0e9d2dc0d..abcb3f477542 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
index 1ed266a241da..d2a15068ecb1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
index f1193deea423..149054aa5878 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
index 5b0880f6c252..8ef92cc9c09e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
index 69ba61e421bb..25db1df010f6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
index ea86e5d595c0..0fa92f2f3c11 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
index b79bfb108f53..d4eaa5acd406 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
index 575e33afaaf7..7f90bb41e601 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 68afad173e8e..b9f9e6e534bb 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
index 9ba2d6a0f9cd..1d31df867e05 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
index 02b3abc589e5..0b0fb72a7bd4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
index 44ef6c4dfcb8..e3febcad093c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
index d439eec4bb6c..f5ca87856455 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
index 982360b302c0..7a8400d89193 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
index 3a50641dde8d..e2db24edc4aa 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
index f539125ebe30..63cb48f4d322 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
index 932bd08f0c5b..c7fa5e62807c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
index 5702a47fb52f..ad892c7be1ce 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
index ec66e930bdf4..c98cd96db2e4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
index 0bb43f42f244..e90d5a34cb4c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
index 5c4a6f50d15b..34ecab13e012 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
index 76de8235c8af..53d3afebac91 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
index 76046312d5d7..5561162eee02 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
index 06b218877b21..4c0db5e9e280 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Animal.md b/samples/client/petstore/java/okhttp-gson/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Animal.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/BigCat.md b/samples/client/petstore/java/okhttp-gson/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/BigCat.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/BigCatAllOf.md b/samples/client/petstore/java/okhttp-gson/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Capitalization.md b/samples/client/petstore/java/okhttp-gson/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Capitalization.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Cat.md b/samples/client/petstore/java/okhttp-gson/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Cat.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/CatAllOf.md b/samples/client/petstore/java/okhttp-gson/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/CatAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Category.md b/samples/client/petstore/java/okhttp-gson/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Category.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ClassModel.md b/samples/client/petstore/java/okhttp-gson/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ClassModel.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Client.md b/samples/client/petstore/java/okhttp-gson/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Client.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Dog.md b/samples/client/petstore/java/okhttp-gson/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Dog.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/DogAllOf.md b/samples/client/petstore/java/okhttp-gson/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/DogAllOf.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/EnumArrays.md b/samples/client/petstore/java/okhttp-gson/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/EnumArrays.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/EnumTest.md b/samples/client/petstore/java/okhttp-gson/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/EnumTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FileSchemaTestClass.md b/samples/client/petstore/java/okhttp-gson/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/okhttp-gson/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MapTest.md b/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Model200Response.md b/samples/client/petstore/java/okhttp-gson/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Model200Response.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ModelApiResponse.md b/samples/client/petstore/java/okhttp-gson/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ModelReturn.md b/samples/client/petstore/java/okhttp-gson/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ModelReturn.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Name.md b/samples/client/petstore/java/okhttp-gson/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Name.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/NumberOnly.md b/samples/client/petstore/java/okhttp-gson/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/NumberOnly.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Order.md b/samples/client/petstore/java/okhttp-gson/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Order.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/OuterComposite.md b/samples/client/petstore/java/okhttp-gson/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/OuterComposite.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Pet.md b/samples/client/petstore/java/okhttp-gson/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Pet.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md b/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/SpecialModelName.md b/samples/client/petstore/java/okhttp-gson/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/Tag.md b/samples/client/petstore/java/okhttp-gson/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/Tag.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/TypeHolderDefault.md b/samples/client/petstore/java/okhttp-gson/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/TypeHolderExample.md b/samples/client/petstore/java/okhttp-gson/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/User.md b/samples/client/petstore/java/okhttp-gson/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/User.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/okhttp-gson/docs/XmlItem.md b/samples/client/petstore/java/okhttp-gson/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/XmlItem.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Animal.md b/samples/client/petstore/java/rest-assured-jackson/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Animal.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ArrayTest.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/BigCat.md b/samples/client/petstore/java/rest-assured-jackson/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/BigCat.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/BigCatAllOf.md b/samples/client/petstore/java/rest-assured-jackson/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Capitalization.md b/samples/client/petstore/java/rest-assured-jackson/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Capitalization.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Cat.md b/samples/client/petstore/java/rest-assured-jackson/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Cat.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/CatAllOf.md b/samples/client/petstore/java/rest-assured-jackson/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/CatAllOf.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Category.md b/samples/client/petstore/java/rest-assured-jackson/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Category.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ClassModel.md b/samples/client/petstore/java/rest-assured-jackson/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ClassModel.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Client.md b/samples/client/petstore/java/rest-assured-jackson/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Client.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Dog.md b/samples/client/petstore/java/rest-assured-jackson/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Dog.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/DogAllOf.md b/samples/client/petstore/java/rest-assured-jackson/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/DogAllOf.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/EnumArrays.md b/samples/client/petstore/java/rest-assured-jackson/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/EnumArrays.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/EnumTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/EnumTest.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FileSchemaTestClass.md b/samples/client/petstore/java/rest-assured-jackson/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/rest-assured-jackson/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/MapTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/MapTest.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Model200Response.md b/samples/client/petstore/java/rest-assured-jackson/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Model200Response.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ModelApiResponse.md b/samples/client/petstore/java/rest-assured-jackson/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ModelReturn.md b/samples/client/petstore/java/rest-assured-jackson/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ModelReturn.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Name.md b/samples/client/petstore/java/rest-assured-jackson/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Name.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/NumberOnly.md b/samples/client/petstore/java/rest-assured-jackson/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/NumberOnly.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Order.md b/samples/client/petstore/java/rest-assured-jackson/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Order.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/OuterComposite.md b/samples/client/petstore/java/rest-assured-jackson/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/OuterComposite.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Pet.md b/samples/client/petstore/java/rest-assured-jackson/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Pet.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/ReadOnlyFirst.md b/samples/client/petstore/java/rest-assured-jackson/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/SpecialModelName.md b/samples/client/petstore/java/rest-assured-jackson/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/Tag.md b/samples/client/petstore/java/rest-assured-jackson/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/Tag.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderDefault.md b/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderExample.md b/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/User.md b/samples/client/petstore/java/rest-assured-jackson/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/User.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/XmlItem.md b/samples/client/petstore/java/rest-assured-jackson/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/XmlItem.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/rest-assured/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Animal.md b/samples/client/petstore/java/rest-assured/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/rest-assured/docs/Animal.md
+++ b/samples/client/petstore/java/rest-assured/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/rest-assured/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/rest-assured/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/rest-assured/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/rest-assured/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/rest-assured/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/rest-assured/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ArrayTest.md b/samples/client/petstore/java/rest-assured/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/rest-assured/docs/ArrayTest.md
+++ b/samples/client/petstore/java/rest-assured/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/BigCat.md b/samples/client/petstore/java/rest-assured/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/rest-assured/docs/BigCat.md
+++ b/samples/client/petstore/java/rest-assured/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/BigCatAllOf.md b/samples/client/petstore/java/rest-assured/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/rest-assured/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/rest-assured/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Capitalization.md b/samples/client/petstore/java/rest-assured/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/rest-assured/docs/Capitalization.md
+++ b/samples/client/petstore/java/rest-assured/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Cat.md b/samples/client/petstore/java/rest-assured/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/rest-assured/docs/Cat.md
+++ b/samples/client/petstore/java/rest-assured/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/CatAllOf.md b/samples/client/petstore/java/rest-assured/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/rest-assured/docs/CatAllOf.md
+++ b/samples/client/petstore/java/rest-assured/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Category.md b/samples/client/petstore/java/rest-assured/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/rest-assured/docs/Category.md
+++ b/samples/client/petstore/java/rest-assured/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ClassModel.md b/samples/client/petstore/java/rest-assured/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/rest-assured/docs/ClassModel.md
+++ b/samples/client/petstore/java/rest-assured/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Client.md b/samples/client/petstore/java/rest-assured/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/rest-assured/docs/Client.md
+++ b/samples/client/petstore/java/rest-assured/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Dog.md b/samples/client/petstore/java/rest-assured/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/rest-assured/docs/Dog.md
+++ b/samples/client/petstore/java/rest-assured/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/DogAllOf.md b/samples/client/petstore/java/rest-assured/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/rest-assured/docs/DogAllOf.md
+++ b/samples/client/petstore/java/rest-assured/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/EnumArrays.md b/samples/client/petstore/java/rest-assured/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/rest-assured/docs/EnumArrays.md
+++ b/samples/client/petstore/java/rest-assured/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/EnumTest.md b/samples/client/petstore/java/rest-assured/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/rest-assured/docs/EnumTest.md
+++ b/samples/client/petstore/java/rest-assured/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/FileSchemaTestClass.md b/samples/client/petstore/java/rest-assured/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/rest-assured/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/rest-assured/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/FormatTest.md b/samples/client/petstore/java/rest-assured/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/rest-assured/docs/FormatTest.md
+++ b/samples/client/petstore/java/rest-assured/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/rest-assured/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/rest-assured/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/rest-assured/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/MapTest.md b/samples/client/petstore/java/rest-assured/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/rest-assured/docs/MapTest.md
+++ b/samples/client/petstore/java/rest-assured/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Model200Response.md b/samples/client/petstore/java/rest-assured/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/rest-assured/docs/Model200Response.md
+++ b/samples/client/petstore/java/rest-assured/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ModelApiResponse.md b/samples/client/petstore/java/rest-assured/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/rest-assured/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/rest-assured/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ModelReturn.md b/samples/client/petstore/java/rest-assured/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/rest-assured/docs/ModelReturn.md
+++ b/samples/client/petstore/java/rest-assured/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Name.md b/samples/client/petstore/java/rest-assured/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/rest-assured/docs/Name.md
+++ b/samples/client/petstore/java/rest-assured/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/NumberOnly.md b/samples/client/petstore/java/rest-assured/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/rest-assured/docs/NumberOnly.md
+++ b/samples/client/petstore/java/rest-assured/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Order.md b/samples/client/petstore/java/rest-assured/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/rest-assured/docs/Order.md
+++ b/samples/client/petstore/java/rest-assured/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/OuterComposite.md b/samples/client/petstore/java/rest-assured/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/rest-assured/docs/OuterComposite.md
+++ b/samples/client/petstore/java/rest-assured/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Pet.md b/samples/client/petstore/java/rest-assured/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/rest-assured/docs/Pet.md
+++ b/samples/client/petstore/java/rest-assured/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/ReadOnlyFirst.md b/samples/client/petstore/java/rest-assured/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/rest-assured/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/rest-assured/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/SpecialModelName.md b/samples/client/petstore/java/rest-assured/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/rest-assured/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/rest-assured/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/Tag.md b/samples/client/petstore/java/rest-assured/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/rest-assured/docs/Tag.md
+++ b/samples/client/petstore/java/rest-assured/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/TypeHolderDefault.md b/samples/client/petstore/java/rest-assured/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/rest-assured/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/rest-assured/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/TypeHolderExample.md b/samples/client/petstore/java/rest-assured/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/rest-assured/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/rest-assured/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/User.md b/samples/client/petstore/java/rest-assured/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/rest-assured/docs/User.md
+++ b/samples/client/petstore/java/rest-assured/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/rest-assured/docs/XmlItem.md b/samples/client/petstore/java/rest-assured/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/rest-assured/docs/XmlItem.md
+++ b/samples/client/petstore/java/rest-assured/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/resteasy/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Animal.md b/samples/client/petstore/java/resteasy/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/resteasy/docs/Animal.md
+++ b/samples/client/petstore/java/resteasy/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/AnotherFakeApi.md b/samples/client/petstore/java/resteasy/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/resteasy/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/resteasy/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/resteasy/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/resteasy/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resteasy/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/resteasy/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/resteasy/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resteasy/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/ArrayTest.md b/samples/client/petstore/java/resteasy/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/resteasy/docs/ArrayTest.md
+++ b/samples/client/petstore/java/resteasy/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/BigCat.md b/samples/client/petstore/java/resteasy/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/resteasy/docs/BigCat.md
+++ b/samples/client/petstore/java/resteasy/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/BigCatAllOf.md b/samples/client/petstore/java/resteasy/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/resteasy/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/resteasy/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Capitalization.md b/samples/client/petstore/java/resteasy/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/resteasy/docs/Capitalization.md
+++ b/samples/client/petstore/java/resteasy/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Cat.md b/samples/client/petstore/java/resteasy/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/resteasy/docs/Cat.md
+++ b/samples/client/petstore/java/resteasy/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/CatAllOf.md b/samples/client/petstore/java/resteasy/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/resteasy/docs/CatAllOf.md
+++ b/samples/client/petstore/java/resteasy/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Category.md b/samples/client/petstore/java/resteasy/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/resteasy/docs/Category.md
+++ b/samples/client/petstore/java/resteasy/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/ClassModel.md b/samples/client/petstore/java/resteasy/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/resteasy/docs/ClassModel.md
+++ b/samples/client/petstore/java/resteasy/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Client.md b/samples/client/petstore/java/resteasy/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/resteasy/docs/Client.md
+++ b/samples/client/petstore/java/resteasy/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Dog.md b/samples/client/petstore/java/resteasy/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/resteasy/docs/Dog.md
+++ b/samples/client/petstore/java/resteasy/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/DogAllOf.md b/samples/client/petstore/java/resteasy/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/resteasy/docs/DogAllOf.md
+++ b/samples/client/petstore/java/resteasy/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/EnumArrays.md b/samples/client/petstore/java/resteasy/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/resteasy/docs/EnumArrays.md
+++ b/samples/client/petstore/java/resteasy/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/EnumTest.md b/samples/client/petstore/java/resteasy/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/resteasy/docs/EnumTest.md
+++ b/samples/client/petstore/java/resteasy/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeApi.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/FileSchemaTestClass.md b/samples/client/petstore/java/resteasy/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/resteasy/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/resteasy/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/FormatTest.md b/samples/client/petstore/java/resteasy/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/resteasy/docs/FormatTest.md
+++ b/samples/client/petstore/java/resteasy/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/resteasy/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/resteasy/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/resteasy/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/MapTest.md b/samples/client/petstore/java/resteasy/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/resteasy/docs/MapTest.md
+++ b/samples/client/petstore/java/resteasy/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Model200Response.md b/samples/client/petstore/java/resteasy/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/resteasy/docs/Model200Response.md
+++ b/samples/client/petstore/java/resteasy/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/ModelApiResponse.md b/samples/client/petstore/java/resteasy/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/resteasy/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/resteasy/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/ModelReturn.md b/samples/client/petstore/java/resteasy/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/resteasy/docs/ModelReturn.md
+++ b/samples/client/petstore/java/resteasy/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Name.md b/samples/client/petstore/java/resteasy/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/resteasy/docs/Name.md
+++ b/samples/client/petstore/java/resteasy/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/NumberOnly.md b/samples/client/petstore/java/resteasy/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/resteasy/docs/NumberOnly.md
+++ b/samples/client/petstore/java/resteasy/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Order.md b/samples/client/petstore/java/resteasy/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/resteasy/docs/Order.md
+++ b/samples/client/petstore/java/resteasy/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/OuterComposite.md b/samples/client/petstore/java/resteasy/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/resteasy/docs/OuterComposite.md
+++ b/samples/client/petstore/java/resteasy/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/Pet.md b/samples/client/petstore/java/resteasy/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/resteasy/docs/Pet.md
+++ b/samples/client/petstore/java/resteasy/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/PetApi.md b/samples/client/petstore/java/resteasy/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/resteasy/docs/PetApi.md
+++ b/samples/client/petstore/java/resteasy/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/ReadOnlyFirst.md b/samples/client/petstore/java/resteasy/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/resteasy/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/resteasy/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/SpecialModelName.md b/samples/client/petstore/java/resteasy/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/resteasy/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/resteasy/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/StoreApi.md b/samples/client/petstore/java/resteasy/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/resteasy/docs/StoreApi.md
+++ b/samples/client/petstore/java/resteasy/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/Tag.md b/samples/client/petstore/java/resteasy/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/resteasy/docs/Tag.md
+++ b/samples/client/petstore/java/resteasy/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/TypeHolderDefault.md b/samples/client/petstore/java/resteasy/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/resteasy/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/resteasy/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/TypeHolderExample.md b/samples/client/petstore/java/resteasy/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/resteasy/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/resteasy/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/User.md b/samples/client/petstore/java/resteasy/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/resteasy/docs/User.md
+++ b/samples/client/petstore/java/resteasy/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resteasy/docs/UserApi.md b/samples/client/petstore/java/resteasy/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/resteasy/docs/UserApi.md
+++ b/samples/client/petstore/java/resteasy/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resteasy/docs/XmlItem.md b/samples/client/petstore/java/resteasy/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/resteasy/docs/XmlItem.md
+++ b/samples/client/petstore/java/resteasy/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Animal.md b/samples/client/petstore/java/resttemplate-withXml/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Animal.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/AnotherFakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ArrayTest.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/BigCat.md b/samples/client/petstore/java/resttemplate-withXml/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/BigCat.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/BigCatAllOf.md b/samples/client/petstore/java/resttemplate-withXml/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Capitalization.md b/samples/client/petstore/java/resttemplate-withXml/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Capitalization.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Cat.md b/samples/client/petstore/java/resttemplate-withXml/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Cat.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/CatAllOf.md b/samples/client/petstore/java/resttemplate-withXml/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/CatAllOf.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Category.md b/samples/client/petstore/java/resttemplate-withXml/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Category.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ClassModel.md b/samples/client/petstore/java/resttemplate-withXml/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ClassModel.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Client.md b/samples/client/petstore/java/resttemplate-withXml/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Client.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Dog.md b/samples/client/petstore/java/resttemplate-withXml/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Dog.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/DogAllOf.md b/samples/client/petstore/java/resttemplate-withXml/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/DogAllOf.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/EnumArrays.md b/samples/client/petstore/java/resttemplate-withXml/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/EnumArrays.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/EnumTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/EnumTest.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FileSchemaTestClass.md b/samples/client/petstore/java/resttemplate-withXml/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/resttemplate-withXml/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/MapTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/MapTest.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Model200Response.md b/samples/client/petstore/java/resttemplate-withXml/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Model200Response.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ModelApiResponse.md b/samples/client/petstore/java/resttemplate-withXml/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ModelReturn.md b/samples/client/petstore/java/resttemplate-withXml/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ModelReturn.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Name.md b/samples/client/petstore/java/resttemplate-withXml/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Name.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/NumberOnly.md b/samples/client/petstore/java/resttemplate-withXml/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/NumberOnly.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/OuterComposite.md b/samples/client/petstore/java/resttemplate-withXml/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/OuterComposite.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md b/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ReadOnlyFirst.md b/samples/client/petstore/java/resttemplate-withXml/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/SpecialModelName.md b/samples/client/petstore/java/resttemplate-withXml/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/Tag.md b/samples/client/petstore/java/resttemplate-withXml/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/Tag.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderDefault.md b/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderExample.md b/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/User.md b/samples/client/petstore/java/resttemplate-withXml/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/User.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/UserApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/UserApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/XmlItem.md b/samples/client/petstore/java/resttemplate-withXml/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/XmlItem.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/resttemplate/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Animal.md b/samples/client/petstore/java/resttemplate/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/resttemplate/docs/Animal.md
+++ b/samples/client/petstore/java/resttemplate/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/AnotherFakeApi.md b/samples/client/petstore/java/resttemplate/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/resttemplate/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/resttemplate/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/resttemplate/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resttemplate/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/resttemplate/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/resttemplate/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/resttemplate/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/ArrayTest.md b/samples/client/petstore/java/resttemplate/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/resttemplate/docs/ArrayTest.md
+++ b/samples/client/petstore/java/resttemplate/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/BigCat.md b/samples/client/petstore/java/resttemplate/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/resttemplate/docs/BigCat.md
+++ b/samples/client/petstore/java/resttemplate/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/BigCatAllOf.md b/samples/client/petstore/java/resttemplate/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/resttemplate/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/resttemplate/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Capitalization.md b/samples/client/petstore/java/resttemplate/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/resttemplate/docs/Capitalization.md
+++ b/samples/client/petstore/java/resttemplate/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Cat.md b/samples/client/petstore/java/resttemplate/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/resttemplate/docs/Cat.md
+++ b/samples/client/petstore/java/resttemplate/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/CatAllOf.md b/samples/client/petstore/java/resttemplate/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/resttemplate/docs/CatAllOf.md
+++ b/samples/client/petstore/java/resttemplate/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Category.md b/samples/client/petstore/java/resttemplate/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/resttemplate/docs/Category.md
+++ b/samples/client/petstore/java/resttemplate/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/ClassModel.md b/samples/client/petstore/java/resttemplate/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/resttemplate/docs/ClassModel.md
+++ b/samples/client/petstore/java/resttemplate/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Client.md b/samples/client/petstore/java/resttemplate/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/resttemplate/docs/Client.md
+++ b/samples/client/petstore/java/resttemplate/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Dog.md b/samples/client/petstore/java/resttemplate/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/resttemplate/docs/Dog.md
+++ b/samples/client/petstore/java/resttemplate/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/DogAllOf.md b/samples/client/petstore/java/resttemplate/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/resttemplate/docs/DogAllOf.md
+++ b/samples/client/petstore/java/resttemplate/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/EnumArrays.md b/samples/client/petstore/java/resttemplate/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/resttemplate/docs/EnumArrays.md
+++ b/samples/client/petstore/java/resttemplate/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/EnumTest.md b/samples/client/petstore/java/resttemplate/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/resttemplate/docs/EnumTest.md
+++ b/samples/client/petstore/java/resttemplate/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/FileSchemaTestClass.md b/samples/client/petstore/java/resttemplate/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/resttemplate/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/resttemplate/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/FormatTest.md b/samples/client/petstore/java/resttemplate/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/resttemplate/docs/FormatTest.md
+++ b/samples/client/petstore/java/resttemplate/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/resttemplate/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/resttemplate/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/resttemplate/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/MapTest.md b/samples/client/petstore/java/resttemplate/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/resttemplate/docs/MapTest.md
+++ b/samples/client/petstore/java/resttemplate/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Model200Response.md b/samples/client/petstore/java/resttemplate/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/resttemplate/docs/Model200Response.md
+++ b/samples/client/petstore/java/resttemplate/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/ModelApiResponse.md b/samples/client/petstore/java/resttemplate/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/resttemplate/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/resttemplate/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/ModelReturn.md b/samples/client/petstore/java/resttemplate/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/resttemplate/docs/ModelReturn.md
+++ b/samples/client/petstore/java/resttemplate/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Name.md b/samples/client/petstore/java/resttemplate/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/resttemplate/docs/Name.md
+++ b/samples/client/petstore/java/resttemplate/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/NumberOnly.md b/samples/client/petstore/java/resttemplate/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/resttemplate/docs/NumberOnly.md
+++ b/samples/client/petstore/java/resttemplate/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Order.md b/samples/client/petstore/java/resttemplate/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/resttemplate/docs/Order.md
+++ b/samples/client/petstore/java/resttemplate/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/OuterComposite.md b/samples/client/petstore/java/resttemplate/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/resttemplate/docs/OuterComposite.md
+++ b/samples/client/petstore/java/resttemplate/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/Pet.md b/samples/client/petstore/java/resttemplate/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/resttemplate/docs/Pet.md
+++ b/samples/client/petstore/java/resttemplate/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/PetApi.md b/samples/client/petstore/java/resttemplate/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/resttemplate/docs/PetApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/ReadOnlyFirst.md b/samples/client/petstore/java/resttemplate/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/resttemplate/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/resttemplate/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/SpecialModelName.md b/samples/client/petstore/java/resttemplate/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/resttemplate/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/resttemplate/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/StoreApi.md b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/resttemplate/docs/StoreApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/Tag.md b/samples/client/petstore/java/resttemplate/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/resttemplate/docs/Tag.md
+++ b/samples/client/petstore/java/resttemplate/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/TypeHolderDefault.md b/samples/client/petstore/java/resttemplate/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/resttemplate/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/resttemplate/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/TypeHolderExample.md b/samples/client/petstore/java/resttemplate/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/resttemplate/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/resttemplate/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/User.md b/samples/client/petstore/java/resttemplate/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/resttemplate/docs/User.md
+++ b/samples/client/petstore/java/resttemplate/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/resttemplate/docs/UserApi.md b/samples/client/petstore/java/resttemplate/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/resttemplate/docs/UserApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/resttemplate/docs/XmlItem.md b/samples/client/petstore/java/resttemplate/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/resttemplate/docs/XmlItem.md
+++ b/samples/client/petstore/java/resttemplate/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Animal.md b/samples/client/petstore/java/retrofit2-play26/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Animal.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2-play26/docs/AnotherFakeApi.md
index f58ecd4216a4..35fdbbbeaaed 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2-play26/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/BigCat.md b/samples/client/petstore/java/retrofit2-play26/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/BigCat.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2-play26/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Capitalization.md b/samples/client/petstore/java/retrofit2-play26/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Capitalization.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Cat.md b/samples/client/petstore/java/retrofit2-play26/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Cat.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2-play26/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/CatAllOf.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Category.md b/samples/client/petstore/java/retrofit2-play26/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Category.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ClassModel.md b/samples/client/petstore/java/retrofit2-play26/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ClassModel.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Client.md b/samples/client/petstore/java/retrofit2-play26/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Client.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Dog.md b/samples/client/petstore/java/retrofit2-play26/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Dog.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2-play26/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/DogAllOf.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2-play26/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/EnumArrays.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/EnumTest.md b/samples/client/petstore/java/retrofit2-play26/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/EnumTest.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
index c531ab56df22..fbeee306c40c 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2-play26/docs/FakeClassnameTags123Api.md
index 4f4dac58589d..f0469bd488b7 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2-play26/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2-play26/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/MapTest.md b/samples/client/petstore/java/retrofit2-play26/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/MapTest.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Model200Response.md b/samples/client/petstore/java/retrofit2-play26/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Model200Response.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2-play26/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2-play26/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ModelReturn.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Name.md b/samples/client/petstore/java/retrofit2-play26/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Name.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2-play26/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/NumberOnly.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Order.md b/samples/client/petstore/java/retrofit2-play26/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2-play26/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/OuterComposite.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Pet.md b/samples/client/petstore/java/retrofit2-play26/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Pet.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md b/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md
index ca4e8b4197a3..c7caacc6ef65 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2-play26/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2-play26/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md b/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
index ebefe2ffdd4b..477e464d88ac 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/Tag.md b/samples/client/petstore/java/retrofit2-play26/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/Tag.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/User.md b/samples/client/petstore/java/retrofit2-play26/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/User.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/UserApi.md b/samples/client/petstore/java/retrofit2-play26/docs/UserApi.md
index d03e871ce01b..8c197c2263d2 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/UserApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/XmlItem.md b/samples/client/petstore/java/retrofit2-play26/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/XmlItem.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/retrofit2/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Animal.md b/samples/client/petstore/java/retrofit2/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/retrofit2/docs/Animal.md
+++ b/samples/client/petstore/java/retrofit2/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2/docs/AnotherFakeApi.md
index f58ecd4216a4..35fdbbbeaaed 100644
--- a/samples/client/petstore/java/retrofit2/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/retrofit2/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/retrofit2/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/BigCat.md b/samples/client/petstore/java/retrofit2/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/retrofit2/docs/BigCat.md
+++ b/samples/client/petstore/java/retrofit2/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/retrofit2/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/retrofit2/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Capitalization.md b/samples/client/petstore/java/retrofit2/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/retrofit2/docs/Capitalization.md
+++ b/samples/client/petstore/java/retrofit2/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Cat.md b/samples/client/petstore/java/retrofit2/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/retrofit2/docs/Cat.md
+++ b/samples/client/petstore/java/retrofit2/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/retrofit2/docs/CatAllOf.md
+++ b/samples/client/petstore/java/retrofit2/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Category.md b/samples/client/petstore/java/retrofit2/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/retrofit2/docs/Category.md
+++ b/samples/client/petstore/java/retrofit2/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/ClassModel.md b/samples/client/petstore/java/retrofit2/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/retrofit2/docs/ClassModel.md
+++ b/samples/client/petstore/java/retrofit2/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Client.md b/samples/client/petstore/java/retrofit2/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/retrofit2/docs/Client.md
+++ b/samples/client/petstore/java/retrofit2/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Dog.md b/samples/client/petstore/java/retrofit2/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/retrofit2/docs/Dog.md
+++ b/samples/client/petstore/java/retrofit2/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/retrofit2/docs/DogAllOf.md
+++ b/samples/client/petstore/java/retrofit2/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/retrofit2/docs/EnumArrays.md
+++ b/samples/client/petstore/java/retrofit2/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/EnumTest.md b/samples/client/petstore/java/retrofit2/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/retrofit2/docs/EnumTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
index c531ab56df22..fbeee306c40c 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
index 4f4dac58589d..f0469bd488b7 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/retrofit2/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/retrofit2/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/retrofit2/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/retrofit2/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/MapTest.md b/samples/client/petstore/java/retrofit2/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/retrofit2/docs/MapTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Model200Response.md b/samples/client/petstore/java/retrofit2/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/retrofit2/docs/Model200Response.md
+++ b/samples/client/petstore/java/retrofit2/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/retrofit2/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/retrofit2/docs/ModelReturn.md
+++ b/samples/client/petstore/java/retrofit2/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Name.md b/samples/client/petstore/java/retrofit2/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/retrofit2/docs/Name.md
+++ b/samples/client/petstore/java/retrofit2/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/retrofit2/docs/NumberOnly.md
+++ b/samples/client/petstore/java/retrofit2/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Order.md b/samples/client/petstore/java/retrofit2/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/retrofit2/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/retrofit2/docs/OuterComposite.md
+++ b/samples/client/petstore/java/retrofit2/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/Pet.md b/samples/client/petstore/java/retrofit2/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/retrofit2/docs/Pet.md
+++ b/samples/client/petstore/java/retrofit2/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/PetApi.md b/samples/client/petstore/java/retrofit2/docs/PetApi.md
index ca4e8b4197a3..c7caacc6ef65 100644
--- a/samples/client/petstore/java/retrofit2/docs/PetApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/retrofit2/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/retrofit2/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
index ebefe2ffdd4b..477e464d88ac 100644
--- a/samples/client/petstore/java/retrofit2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/Tag.md b/samples/client/petstore/java/retrofit2/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/retrofit2/docs/Tag.md
+++ b/samples/client/petstore/java/retrofit2/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/retrofit2/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/retrofit2/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/retrofit2/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/retrofit2/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/User.md b/samples/client/petstore/java/retrofit2/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/retrofit2/docs/User.md
+++ b/samples/client/petstore/java/retrofit2/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2/docs/UserApi.md b/samples/client/petstore/java/retrofit2/docs/UserApi.md
index d03e871ce01b..8c197c2263d2 100644
--- a/samples/client/petstore/java/retrofit2/docs/UserApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2/docs/XmlItem.md b/samples/client/petstore/java/retrofit2/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/retrofit2/docs/XmlItem.md
+++ b/samples/client/petstore/java/retrofit2/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Animal.md b/samples/client/petstore/java/retrofit2rx2/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Animal.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/AnotherFakeApi.md
index f58ecd4216a4..35fdbbbeaaed 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx2/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/BigCat.md b/samples/client/petstore/java/retrofit2rx2/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/BigCat.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2rx2/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Capitalization.md b/samples/client/petstore/java/retrofit2rx2/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Capitalization.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Cat.md b/samples/client/petstore/java/retrofit2rx2/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Cat.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2rx2/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/CatAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Category.md b/samples/client/petstore/java/retrofit2rx2/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Category.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ClassModel.md b/samples/client/petstore/java/retrofit2rx2/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ClassModel.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Client.md b/samples/client/petstore/java/retrofit2rx2/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Client.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Dog.md b/samples/client/petstore/java/retrofit2rx2/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Dog.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2rx2/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/DogAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2rx2/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/EnumArrays.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/EnumTest.md b/samples/client/petstore/java/retrofit2rx2/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/EnumTest.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
index c531ab56df22..fbeee306c40c 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
index 4f4dac58589d..f0469bd488b7 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2rx2/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2rx2/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/MapTest.md b/samples/client/petstore/java/retrofit2rx2/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/MapTest.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Model200Response.md b/samples/client/petstore/java/retrofit2rx2/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Model200Response.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2rx2/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2rx2/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ModelReturn.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Name.md b/samples/client/petstore/java/retrofit2rx2/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Name.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2rx2/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/NumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Order.md b/samples/client/petstore/java/retrofit2rx2/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2rx2/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/OuterComposite.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Pet.md b/samples/client/petstore/java/retrofit2rx2/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Pet.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md
index ca4e8b4197a3..c7caacc6ef65 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2rx2/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2rx2/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
index ebefe2ffdd4b..477e464d88ac 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/Tag.md b/samples/client/petstore/java/retrofit2rx2/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/Tag.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/User.md b/samples/client/petstore/java/retrofit2rx2/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/User.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md
index d03e871ce01b..8c197c2263d2 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/XmlItem.md b/samples/client/petstore/java/retrofit2rx2/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/XmlItem.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Animal.md b/samples/client/petstore/java/retrofit2rx3/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Animal.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md
index f58ecd4216a4..35fdbbbeaaed 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md b/samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/BigCat.md b/samples/client/petstore/java/retrofit2rx3/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/BigCat.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md b/samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Cat.md b/samples/client/petstore/java/retrofit2rx3/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Cat.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Category.md b/samples/client/petstore/java/retrofit2rx3/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Category.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md b/samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Client.md b/samples/client/petstore/java/retrofit2rx3/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Client.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Dog.md b/samples/client/petstore/java/retrofit2rx3/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Dog.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md b/samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md b/samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md b/samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
index c531ab56df22..fbeee306c40c 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md
index 4f4dac58589d..f0469bd488b7 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md b/samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/MapTest.md b/samples/client/petstore/java/retrofit2rx3/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/MapTest.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md b/samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md b/samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md b/samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Name.md b/samples/client/petstore/java/retrofit2rx3/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Name.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md b/samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Order.md b/samples/client/petstore/java/retrofit2rx3/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Order.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md b/samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Pet.md b/samples/client/petstore/java/retrofit2rx3/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Pet.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/PetApi.md b/samples/client/petstore/java/retrofit2rx3/docs/PetApi.md
index ca4e8b4197a3..c7caacc6ef65 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/PetApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md b/samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md b/samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md b/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
index ebefe2ffdd4b..477e464d88ac 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/Tag.md b/samples/client/petstore/java/retrofit2rx3/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/Tag.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/User.md b/samples/client/petstore/java/retrofit2rx3/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/User.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/UserApi.md b/samples/client/petstore/java/retrofit2rx3/docs/UserApi.md
index d03e871ce01b..8c197c2263d2 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/UserApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md b/samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Animal.md b/samples/client/petstore/java/vertx-no-nullable/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Animal.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/AnotherFakeApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ArrayTest.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/BigCat.md b/samples/client/petstore/java/vertx-no-nullable/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/BigCat.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/BigCatAllOf.md b/samples/client/petstore/java/vertx-no-nullable/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Capitalization.md b/samples/client/petstore/java/vertx-no-nullable/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Capitalization.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Cat.md b/samples/client/petstore/java/vertx-no-nullable/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Cat.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/CatAllOf.md b/samples/client/petstore/java/vertx-no-nullable/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/CatAllOf.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Category.md b/samples/client/petstore/java/vertx-no-nullable/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Category.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ClassModel.md b/samples/client/petstore/java/vertx-no-nullable/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ClassModel.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Client.md b/samples/client/petstore/java/vertx-no-nullable/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Client.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Dog.md b/samples/client/petstore/java/vertx-no-nullable/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Dog.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/DogAllOf.md b/samples/client/petstore/java/vertx-no-nullable/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/DogAllOf.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/EnumArrays.md b/samples/client/petstore/java/vertx-no-nullable/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/EnumArrays.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/EnumTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/EnumTest.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
index 38bf96d4fad3..3dc32ffd383d 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/vertx-no-nullable/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FileSchemaTestClass.md b/samples/client/petstore/java/vertx-no-nullable/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
index 00815ade8bda..8a77a27772f4 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/vertx-no-nullable/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/MapTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/MapTest.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Model200Response.md b/samples/client/petstore/java/vertx-no-nullable/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Model200Response.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ModelApiResponse.md b/samples/client/petstore/java/vertx-no-nullable/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ModelReturn.md b/samples/client/petstore/java/vertx-no-nullable/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ModelReturn.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Name.md b/samples/client/petstore/java/vertx-no-nullable/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Name.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/NumberOnly.md b/samples/client/petstore/java/vertx-no-nullable/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/NumberOnly.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Order.md b/samples/client/petstore/java/vertx-no-nullable/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Order.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/OuterComposite.md b/samples/client/petstore/java/vertx-no-nullable/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/OuterComposite.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Pet.md b/samples/client/petstore/java/vertx-no-nullable/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Pet.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/PetApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/PetApi.md
index 4a8a3f1993a2..ffb21c7396f1 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/PetApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/ReadOnlyFirst.md b/samples/client/petstore/java/vertx-no-nullable/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/SpecialModelName.md b/samples/client/petstore/java/vertx-no-nullable/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/Tag.md b/samples/client/petstore/java/vertx-no-nullable/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/Tag.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderDefault.md b/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderExample.md b/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/User.md b/samples/client/petstore/java/vertx-no-nullable/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/User.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/UserApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/UserApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/XmlItem.md b/samples/client/petstore/java/vertx-no-nullable/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/XmlItem.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/vertx/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/vertx/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Animal.md b/samples/client/petstore/java/vertx/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/vertx/docs/Animal.md
+++ b/samples/client/petstore/java/vertx/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/AnotherFakeApi.md b/samples/client/petstore/java/vertx/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/vertx/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/vertx/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/vertx/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/vertx/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/vertx/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/vertx/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/vertx/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/vertx/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/ArrayTest.md b/samples/client/petstore/java/vertx/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/vertx/docs/ArrayTest.md
+++ b/samples/client/petstore/java/vertx/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/BigCat.md b/samples/client/petstore/java/vertx/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/vertx/docs/BigCat.md
+++ b/samples/client/petstore/java/vertx/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/BigCatAllOf.md b/samples/client/petstore/java/vertx/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/vertx/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/vertx/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Capitalization.md b/samples/client/petstore/java/vertx/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/vertx/docs/Capitalization.md
+++ b/samples/client/petstore/java/vertx/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Cat.md b/samples/client/petstore/java/vertx/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/vertx/docs/Cat.md
+++ b/samples/client/petstore/java/vertx/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/CatAllOf.md b/samples/client/petstore/java/vertx/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/vertx/docs/CatAllOf.md
+++ b/samples/client/petstore/java/vertx/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Category.md b/samples/client/petstore/java/vertx/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/vertx/docs/Category.md
+++ b/samples/client/petstore/java/vertx/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/ClassModel.md b/samples/client/petstore/java/vertx/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/vertx/docs/ClassModel.md
+++ b/samples/client/petstore/java/vertx/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Client.md b/samples/client/petstore/java/vertx/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/vertx/docs/Client.md
+++ b/samples/client/petstore/java/vertx/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Dog.md b/samples/client/petstore/java/vertx/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/vertx/docs/Dog.md
+++ b/samples/client/petstore/java/vertx/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/DogAllOf.md b/samples/client/petstore/java/vertx/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/vertx/docs/DogAllOf.md
+++ b/samples/client/petstore/java/vertx/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/EnumArrays.md b/samples/client/petstore/java/vertx/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/vertx/docs/EnumArrays.md
+++ b/samples/client/petstore/java/vertx/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/EnumTest.md b/samples/client/petstore/java/vertx/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/vertx/docs/EnumTest.md
+++ b/samples/client/petstore/java/vertx/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md
index 38bf96d4fad3..3dc32ffd383d 100644
--- a/samples/client/petstore/java/vertx/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/vertx/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/vertx/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/vertx/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/FileSchemaTestClass.md b/samples/client/petstore/java/vertx/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/vertx/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/vertx/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/FormatTest.md b/samples/client/petstore/java/vertx/docs/FormatTest.md
index 00815ade8bda..8a77a27772f4 100644
--- a/samples/client/petstore/java/vertx/docs/FormatTest.md
+++ b/samples/client/petstore/java/vertx/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/vertx/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/vertx/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/vertx/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/MapTest.md b/samples/client/petstore/java/vertx/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/vertx/docs/MapTest.md
+++ b/samples/client/petstore/java/vertx/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Model200Response.md b/samples/client/petstore/java/vertx/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/vertx/docs/Model200Response.md
+++ b/samples/client/petstore/java/vertx/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/ModelApiResponse.md b/samples/client/petstore/java/vertx/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/vertx/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/vertx/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/ModelReturn.md b/samples/client/petstore/java/vertx/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/vertx/docs/ModelReturn.md
+++ b/samples/client/petstore/java/vertx/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Name.md b/samples/client/petstore/java/vertx/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/vertx/docs/Name.md
+++ b/samples/client/petstore/java/vertx/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/NumberOnly.md b/samples/client/petstore/java/vertx/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/vertx/docs/NumberOnly.md
+++ b/samples/client/petstore/java/vertx/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Order.md b/samples/client/petstore/java/vertx/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/vertx/docs/Order.md
+++ b/samples/client/petstore/java/vertx/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/OuterComposite.md b/samples/client/petstore/java/vertx/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/vertx/docs/OuterComposite.md
+++ b/samples/client/petstore/java/vertx/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/Pet.md b/samples/client/petstore/java/vertx/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/vertx/docs/Pet.md
+++ b/samples/client/petstore/java/vertx/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/PetApi.md b/samples/client/petstore/java/vertx/docs/PetApi.md
index 4a8a3f1993a2..ffb21c7396f1 100644
--- a/samples/client/petstore/java/vertx/docs/PetApi.md
+++ b/samples/client/petstore/java/vertx/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/ReadOnlyFirst.md b/samples/client/petstore/java/vertx/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/vertx/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/vertx/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/SpecialModelName.md b/samples/client/petstore/java/vertx/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/vertx/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/vertx/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/StoreApi.md b/samples/client/petstore/java/vertx/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/vertx/docs/StoreApi.md
+++ b/samples/client/petstore/java/vertx/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/Tag.md b/samples/client/petstore/java/vertx/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/vertx/docs/Tag.md
+++ b/samples/client/petstore/java/vertx/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/TypeHolderDefault.md b/samples/client/petstore/java/vertx/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/vertx/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/vertx/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/TypeHolderExample.md b/samples/client/petstore/java/vertx/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/vertx/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/vertx/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/User.md b/samples/client/petstore/java/vertx/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/vertx/docs/User.md
+++ b/samples/client/petstore/java/vertx/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/vertx/docs/UserApi.md b/samples/client/petstore/java/vertx/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/vertx/docs/UserApi.md
+++ b/samples/client/petstore/java/vertx/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/vertx/docs/XmlItem.md b/samples/client/petstore/java/vertx/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/vertx/docs/XmlItem.md
+++ b/samples/client/petstore/java/vertx/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesAnyType.md
index 87b468bb7ca3..7bbe63d23f80 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesAnyType.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesArray.md
index cb7fe9b3903d..bdbf2962f201 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesArray.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesArray
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesBoolean.md
index 6b53e7ba73a1..81aeb9ae1e78 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesBoolean.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md
index f9e189355cfd..f936ebe14261 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesInteger.md
index d2ed7fb1a460..ae3391237145 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesInteger.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesInteger
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesNumber.md
index 53f6e81e7176..8f414ad02fdc 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesNumber.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesNumber
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesObject.md
index 98ac8d2e5fe0..41892793f0b0 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesObject.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesObject
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesString.md
index d7970cdfe190..a2dfbc116f9b 100644
--- a/samples/client/petstore/java/webclient/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/java/webclient/docs/AdditionalPropertiesString.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesString
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Animal.md b/samples/client/petstore/java/webclient/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/client/petstore/java/webclient/docs/Animal.md
+++ b/samples/client/petstore/java/webclient/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/AnotherFakeApi.md b/samples/client/petstore/java/webclient/docs/AnotherFakeApi.md
index 059616ec6baa..12e20b22218c 100644
--- a/samples/client/petstore/java/webclient/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/webclient/docs/AnotherFakeApi.md
@@ -67,6 +67,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/webclient/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/client/petstore/java/webclient/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/webclient/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/webclient/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/client/petstore/java/webclient/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/java/webclient/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/ArrayTest.md b/samples/client/petstore/java/webclient/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/client/petstore/java/webclient/docs/ArrayTest.md
+++ b/samples/client/petstore/java/webclient/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/BigCat.md b/samples/client/petstore/java/webclient/docs/BigCat.md
index 8a075304abf8..020fbc787d81 100644
--- a/samples/client/petstore/java/webclient/docs/BigCat.md
+++ b/samples/client/petstore/java/webclient/docs/BigCat.md
@@ -2,6 +2,7 @@
 
 # BigCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/BigCatAllOf.md b/samples/client/petstore/java/webclient/docs/BigCatAllOf.md
index 21177dbf089d..2bcace910ec8 100644
--- a/samples/client/petstore/java/webclient/docs/BigCatAllOf.md
+++ b/samples/client/petstore/java/webclient/docs/BigCatAllOf.md
@@ -2,6 +2,7 @@
 
 # BigCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Capitalization.md b/samples/client/petstore/java/webclient/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/client/petstore/java/webclient/docs/Capitalization.md
+++ b/samples/client/petstore/java/webclient/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Cat.md b/samples/client/petstore/java/webclient/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/client/petstore/java/webclient/docs/Cat.md
+++ b/samples/client/petstore/java/webclient/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/CatAllOf.md b/samples/client/petstore/java/webclient/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/client/petstore/java/webclient/docs/CatAllOf.md
+++ b/samples/client/petstore/java/webclient/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Category.md b/samples/client/petstore/java/webclient/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/client/petstore/java/webclient/docs/Category.md
+++ b/samples/client/petstore/java/webclient/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/ClassModel.md b/samples/client/petstore/java/webclient/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/client/petstore/java/webclient/docs/ClassModel.md
+++ b/samples/client/petstore/java/webclient/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Client.md b/samples/client/petstore/java/webclient/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/client/petstore/java/webclient/docs/Client.md
+++ b/samples/client/petstore/java/webclient/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Dog.md b/samples/client/petstore/java/webclient/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/client/petstore/java/webclient/docs/Dog.md
+++ b/samples/client/petstore/java/webclient/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/DogAllOf.md b/samples/client/petstore/java/webclient/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/client/petstore/java/webclient/docs/DogAllOf.md
+++ b/samples/client/petstore/java/webclient/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/EnumArrays.md b/samples/client/petstore/java/webclient/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/client/petstore/java/webclient/docs/EnumArrays.md
+++ b/samples/client/petstore/java/webclient/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/EnumTest.md b/samples/client/petstore/java/webclient/docs/EnumTest.md
index e066d77e5b07..6b3aa33fae88 100644
--- a/samples/client/petstore/java/webclient/docs/EnumTest.md
+++ b/samples/client/petstore/java/webclient/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md
index 9c46433be47a..a71dd8aa4a7f 100644
--- a/samples/client/petstore/java/webclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient/docs/FakeApi.md
@@ -79,6 +79,7 @@ No authorization required
 - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -144,6 +145,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -209,6 +211,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +277,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -339,6 +343,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -403,6 +408,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -467,6 +473,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +539,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -628,6 +636,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -707,6 +716,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -782,6 +792,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -844,6 +855,7 @@ No authorization required
 - **Content-Type**: application/json
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -908,6 +920,7 @@ No authorization required
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -980,6 +993,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/webclient/docs/FakeClassnameTags123Api.md
index 14a74a37a4e2..ea4765a69ad0 100644
--- a/samples/client/petstore/java/webclient/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/java/webclient/docs/FakeClassnameTags123Api.md
@@ -74,6 +74,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: application/json
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/FileSchemaTestClass.md b/samples/client/petstore/java/webclient/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/client/petstore/java/webclient/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/java/webclient/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/FormatTest.md b/samples/client/petstore/java/webclient/docs/FormatTest.md
index 60fa43000130..a35f0b3962c4 100644
--- a/samples/client/petstore/java/webclient/docs/FormatTest.md
+++ b/samples/client/petstore/java/webclient/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/webclient/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/client/petstore/java/webclient/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/java/webclient/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/MapTest.md b/samples/client/petstore/java/webclient/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/client/petstore/java/webclient/docs/MapTest.md
+++ b/samples/client/petstore/java/webclient/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Model200Response.md b/samples/client/petstore/java/webclient/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/client/petstore/java/webclient/docs/Model200Response.md
+++ b/samples/client/petstore/java/webclient/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/ModelApiResponse.md b/samples/client/petstore/java/webclient/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/client/petstore/java/webclient/docs/ModelApiResponse.md
+++ b/samples/client/petstore/java/webclient/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/ModelReturn.md b/samples/client/petstore/java/webclient/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/client/petstore/java/webclient/docs/ModelReturn.md
+++ b/samples/client/petstore/java/webclient/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Name.md b/samples/client/petstore/java/webclient/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/client/petstore/java/webclient/docs/Name.md
+++ b/samples/client/petstore/java/webclient/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/NumberOnly.md b/samples/client/petstore/java/webclient/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/client/petstore/java/webclient/docs/NumberOnly.md
+++ b/samples/client/petstore/java/webclient/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Order.md b/samples/client/petstore/java/webclient/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/client/petstore/java/webclient/docs/Order.md
+++ b/samples/client/petstore/java/webclient/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/OuterComposite.md b/samples/client/petstore/java/webclient/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/client/petstore/java/webclient/docs/OuterComposite.md
+++ b/samples/client/petstore/java/webclient/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/Pet.md b/samples/client/petstore/java/webclient/docs/Pet.md
index bdcdad6b3e60..e9116d637187 100644
--- a/samples/client/petstore/java/webclient/docs/Pet.md
+++ b/samples/client/petstore/java/webclient/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/PetApi.md b/samples/client/petstore/java/webclient/docs/PetApi.md
index d56efcd59677..798a210c1456 100644
--- a/samples/client/petstore/java/webclient/docs/PetApi.md
+++ b/samples/client/petstore/java/webclient/docs/PetApi.md
@@ -77,6 +77,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -147,6 +148,7 @@ null (empty response body)
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -218,6 +220,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -289,6 +292,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -362,6 +366,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -431,6 +436,7 @@ null (empty response body)
 - **Content-Type**: application/json, application/xml
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -505,6 +511,7 @@ null (empty response body)
 - **Content-Type**: application/x-www-form-urlencoded
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -577,6 +584,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +657,7 @@ Name | Type | Description  | Notes
 - **Content-Type**: multipart/form-data
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/ReadOnlyFirst.md b/samples/client/petstore/java/webclient/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/client/petstore/java/webclient/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/java/webclient/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/SpecialModelName.md b/samples/client/petstore/java/webclient/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/client/petstore/java/webclient/docs/SpecialModelName.md
+++ b/samples/client/petstore/java/webclient/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/StoreApi.md b/samples/client/petstore/java/webclient/docs/StoreApi.md
index 352399ea515c..2e59caca46e7 100644
--- a/samples/client/petstore/java/webclient/docs/StoreApi.md
+++ b/samples/client/petstore/java/webclient/docs/StoreApi.md
@@ -69,6 +69,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +139,7 @@ This endpoint does not need any parameter.
 - **Content-Type**: Not defined
 - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -203,6 +205,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -268,6 +271,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/Tag.md b/samples/client/petstore/java/webclient/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/client/petstore/java/webclient/docs/Tag.md
+++ b/samples/client/petstore/java/webclient/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/TypeHolderDefault.md b/samples/client/petstore/java/webclient/docs/TypeHolderDefault.md
index e28c7a9df589..8340befcae5c 100644
--- a/samples/client/petstore/java/webclient/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/java/webclient/docs/TypeHolderDefault.md
@@ -2,6 +2,7 @@
 
 # TypeHolderDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/TypeHolderExample.md b/samples/client/petstore/java/webclient/docs/TypeHolderExample.md
index 96f0d4bebf44..2396fdf17653 100644
--- a/samples/client/petstore/java/webclient/docs/TypeHolderExample.md
+++ b/samples/client/petstore/java/webclient/docs/TypeHolderExample.md
@@ -2,6 +2,7 @@
 
 # TypeHolderExample
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/User.md b/samples/client/petstore/java/webclient/docs/User.md
index c4ea94b7fc17..05ec5fb40b8f 100644
--- a/samples/client/petstore/java/webclient/docs/User.md
+++ b/samples/client/petstore/java/webclient/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/java/webclient/docs/UserApi.md b/samples/client/petstore/java/webclient/docs/UserApi.md
index ca9f550c3167..d651e8b349d3 100644
--- a/samples/client/petstore/java/webclient/docs/UserApi.md
+++ b/samples/client/petstore/java/webclient/docs/UserApi.md
@@ -73,6 +73,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -135,6 +136,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -197,6 +199,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -261,6 +264,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +329,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -392,6 +397,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -451,6 +457,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -517,6 +524,7 @@ No authorization required
 - **Content-Type**: Not defined
 - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/java/webclient/docs/XmlItem.md b/samples/client/petstore/java/webclient/docs/XmlItem.md
index 096fdc7b09ac..8c184da283df 100644
--- a/samples/client/petstore/java/webclient/docs/XmlItem.md
+++ b/samples/client/petstore/java/webclient/docs/XmlItem.md
@@ -2,6 +2,7 @@
 
 # XmlItem
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/client/petstore/javascript-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
index 85edf0d17173..2c4e0d99d58c 100644
--- a/samples/client/petstore/javascript-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-es6/.openapi-generator/FILES
@@ -34,7 +34,6 @@ docs/List.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
-docs/ModelReturn.md
 docs/Name.md
 docs/NullableClass.md
 docs/NumberOnly.md
@@ -44,9 +43,11 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
+docs/Return.md
 docs/SpecialModelName.md
 docs/StoreApi.md
 docs/Tag.md
@@ -92,7 +93,6 @@ src/model/List.js
 src/model/MapTest.js
 src/model/MixedPropertiesAndAdditionalPropertiesClass.js
 src/model/Model200Response.js
-src/model/ModelReturn.js
 src/model/Name.js
 src/model/NullableClass.js
 src/model/NumberOnly.js
@@ -102,8 +102,10 @@ src/model/OuterEnum.js
 src/model/OuterEnumDefaultValue.js
 src/model/OuterEnumInteger.js
 src/model/OuterEnumIntegerDefaultValue.js
+src/model/OuterObjectWithEnumProperty.js
 src/model/Pet.js
 src/model/ReadOnlyFirst.js
+src/model/Return.js
 src/model/SpecialModelName.js
 src/model/Tag.js
 src/model/User.js
diff --git a/samples/client/petstore/javascript-es6/README.md b/samples/client/petstore/javascript-es6/README.md
index 3855805f70f1..7484625b457e 100644
--- a/samples/client/petstore/javascript-es6/README.md
+++ b/samples/client/petstore/javascript-es6/README.md
@@ -128,6 +128,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**fakePropertyEnumIntegerSerialize**](docs/FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -191,7 +192,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
  - [OpenApiPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [OpenApiPetstore.Model200Response](docs/Model200Response.md)
- - [OpenApiPetstore.ModelReturn](docs/ModelReturn.md)
  - [OpenApiPetstore.Name](docs/Name.md)
  - [OpenApiPetstore.NullableClass](docs/NullableClass.md)
  - [OpenApiPetstore.NumberOnly](docs/NumberOnly.md)
@@ -201,8 +201,10 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [OpenApiPetstore.OuterEnumInteger](docs/OuterEnumInteger.md)
  - [OpenApiPetstore.OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [OpenApiPetstore.OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [OpenApiPetstore.Return](docs/Return.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
diff --git a/samples/client/petstore/javascript-es6/docs/FakeApi.md b/samples/client/petstore/javascript-es6/docs/FakeApi.md
index 23f6e3456ba6..95446d77d5e0 100644
--- a/samples/client/petstore/javascript-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-es6/docs/FakeApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -299,6 +300,51 @@ No authorization required
 - **Accept**: */*
 
 
+## fakePropertyEnumIntegerSerialize
+
+> OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example
+
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+
+let apiInstance = new OpenApiPetstore.FakeApi();
+let outerObjectWithEnumProperty = new OpenApiPetstore.OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+apiInstance.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty, (error, data, response) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('API called successfully. Returned data: ' + data);
+  }
+});
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: */*
+
+
 ## testBodyWithFileSchema
 
 > testBodyWithFileSchema(fileSchemaTestClass)
@@ -436,7 +482,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -453,7 +499,7 @@ http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let _number = 3.4; // Number | None
+let number = 3.4; // Number | None
 let _double = 3.4; // Number | None
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 let _byte = null; // Blob | None
@@ -462,14 +508,14 @@ let opts = {
   'int32': 56, // Number | None
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
-  '_string': "_string_example", // String | None
+  'string': "string_example", // String | None
   'binary': "/path/to/file", // File | None
-  '_date': new Date("2013-10-20"), // Date | None
+  'date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
   'callback': "callback_example" // String | None
 };
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
+apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts, (error, data, response) => {
   if (error) {
     console.error(error);
   } else {
@@ -483,7 +529,7 @@ apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _b
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **_number** | **Number**| None | 
+ **number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
  **_byte** | **Blob**| None | 
@@ -491,9 +537,9 @@ Name | Type | Description  | Notes
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
- **_string** | **String**| None | [optional] 
+ **string** | **String**| None | [optional] 
  **binary** | **File**| None | [optional] 
- **_date** | **Date**| None | [optional] 
+ **date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 
  **callback** | **String**| None | [optional] 
diff --git a/samples/client/petstore/javascript-es6/docs/FormatTest.md b/samples/client/petstore/javascript-es6/docs/FormatTest.md
index b6424d6230ff..c1f26210e3ec 100644
--- a/samples/client/petstore/javascript-es6/docs/FormatTest.md
+++ b/samples/client/petstore/javascript-es6/docs/FormatTest.md
@@ -7,14 +7,14 @@ Name | Type | Description | Notes
 **integer** | **Number** |  | [optional] 
 **int32** | **Number** |  | [optional] 
 **int64** | **Number** |  | [optional] 
-**_number** | **Number** |  | 
+**number** | **Number** |  | 
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **decimal** | **Number** |  | [optional] 
-**_string** | **String** |  | [optional] 
+**string** | **String** |  | [optional] 
 **_byte** | **Blob** |  | 
 **binary** | **File** |  | [optional] 
-**_date** | **Date** |  | 
+**date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 
 **password** | **String** |  | 
diff --git a/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md b/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
index 19cae09524bd..3bd01f8f7d43 100644
--- a/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/javascript-es6/docs/InlineResponseDefault.md
@@ -4,6 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_string** | [**Foo**](Foo.md) |  | [optional] 
+**string** | [**Foo**](Foo.md) |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript-es6/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/javascript-es6/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..a16331e63a6f
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.OuterObjectWithEnumProperty
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+
diff --git a/samples/client/petstore/javascript-es6/docs/Return.md b/samples/client/petstore/javascript-es6/docs/Return.md
new file mode 100644
index 000000000000..94b747a28f2c
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/docs/Return.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.Return
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Number** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
index bfb8488e1bdb..33f85635f091 100644
--- a/samples/client/petstore/javascript-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
@@ -17,6 +17,7 @@ import Client from '../model/Client';
 import FileSchemaTestClass from '../model/FileSchemaTestClass';
 import HealthCheckResult from '../model/HealthCheckResult';
 import OuterComposite from '../model/OuterComposite';
+import OuterObjectWithEnumProperty from '../model/OuterObjectWithEnumProperty';
 import Pet from '../model/Pet';
 import User from '../model/User';
 
@@ -277,6 +278,47 @@ export default class FakeApi {
       );
     }
 
+    /**
+     * Callback function to receive the result of the fakePropertyEnumIntegerSerialize operation.
+     * @callback module:api/FakeApi~fakePropertyEnumIntegerSerializeCallback
+     * @param {String} error Error message, if any.
+     * @param {module:model/OuterObjectWithEnumProperty} data The data returned by the service call.
+     * @param {String} response The complete HTTP response.
+     */
+
+    /**
+     * Test serialization of enum (int) properties with examples
+     * @param {module:model/OuterObjectWithEnumProperty} outerObjectWithEnumProperty Input enum (int) as post body
+     * @param {module:api/FakeApi~fakePropertyEnumIntegerSerializeCallback} callback The callback function, accepting three arguments: error, data, response
+     * data is of type: {@link module:model/OuterObjectWithEnumProperty}
+     */
+    fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty, callback) {
+      let postBody = outerObjectWithEnumProperty;
+      // verify the required parameter 'outerObjectWithEnumProperty' is set
+      if (outerObjectWithEnumProperty === undefined || outerObjectWithEnumProperty === null) {
+        throw new Error("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize");
+      }
+
+      let pathParams = {
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+      };
+
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['*/*'];
+      let returnType = OuterObjectWithEnumProperty;
+      return this.apiClient.callApi(
+        '/fake/property/enum-int', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, null, callback
+      );
+    }
+
     /**
      * Callback function to receive the result of the testBodyWithFileSchema operation.
      * @callback module:api/FakeApi~testBodyWithFileSchemaCallback
@@ -415,7 +457,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -424,20 +466,20 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @param {module:api/FakeApi~testEndpointParametersCallback} callback The callback function, accepting three arguments: error, data, response
      */
-    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts, callback) {
+    testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts, callback) {
       opts = opts || {};
       let postBody = null;
-      // verify the required parameter '_number' is set
-      if (_number === undefined || _number === null) {
-        throw new Error("Missing the required parameter '_number' when calling testEndpointParameters");
+      // verify the required parameter 'number' is set
+      if (number === undefined || number === null) {
+        throw new Error("Missing the required parameter 'number' when calling testEndpointParameters");
       }
       // verify the required parameter '_double' is set
       if (_double === undefined || _double === null) {
@@ -462,14 +504,14 @@ export default class FakeApi {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
-        'number': _number,
+        'number': number,
         'float': opts['_float'],
         'double': _double,
-        'string': opts['_string'],
+        'string': opts['string'],
         'pattern_without_delimiter': patternWithoutDelimiter,
         'byte': _byte,
         'binary': opts['binary'],
-        'date': opts['_date'],
+        'date': opts['date'],
         'dateTime': opts['dateTime'],
         'password': opts['password'],
         'callback': opts['callback']
diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
index 33321542c648..2c5e07c03a63 100644
--- a/samples/client/petstore/javascript-es6/src/index.js
+++ b/samples/client/petstore/javascript-es6/src/index.js
@@ -41,7 +41,6 @@ import List from './model/List';
 import MapTest from './model/MapTest';
 import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
 import Model200Response from './model/Model200Response';
-import ModelReturn from './model/ModelReturn';
 import Name from './model/Name';
 import NullableClass from './model/NullableClass';
 import NumberOnly from './model/NumberOnly';
@@ -51,8 +50,10 @@ import OuterEnum from './model/OuterEnum';
 import OuterEnumDefaultValue from './model/OuterEnumDefaultValue';
 import OuterEnumInteger from './model/OuterEnumInteger';
 import OuterEnumIntegerDefaultValue from './model/OuterEnumIntegerDefaultValue';
+import OuterObjectWithEnumProperty from './model/OuterObjectWithEnumProperty';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
+import Return from './model/Return';
 import SpecialModelName from './model/SpecialModelName';
 import Tag from './model/Tag';
 import User from './model/User';
@@ -271,12 +272,6 @@ export {
      */
     Model200Response,
 
-    /**
-     * The ModelReturn model constructor.
-     * @property {module:model/ModelReturn}
-     */
-    ModelReturn,
-
     /**
      * The Name model constructor.
      * @property {module:model/Name}
@@ -331,6 +326,12 @@ export {
      */
     OuterEnumIntegerDefaultValue,
 
+    /**
+     * The OuterObjectWithEnumProperty model constructor.
+     * @property {module:model/OuterObjectWithEnumProperty}
+     */
+    OuterObjectWithEnumProperty,
+
     /**
      * The Pet model constructor.
      * @property {module:model/Pet}
@@ -343,6 +344,12 @@ export {
      */
     ReadOnlyFirst,
 
+    /**
+     * The Return model constructor.
+     * @property {module:model/Return}
+     */
+    Return,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
index 7d1944dd9c0b..00ee3533d060 100644
--- a/samples/client/petstore/javascript-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
@@ -22,14 +22,14 @@ class FormatTest {
     /**
      * Constructs a new <code>FormatTest</code>.
      * @alias module:model/FormatTest
-     * @param _number {Number} 
+     * @param number {Number} 
      * @param _byte {Blob} 
-     * @param _date {Date} 
+     * @param date {Date} 
      * @param password {String} 
      */
-    constructor(_number, _byte, _date, password) { 
+    constructor(number, _byte, date, password) { 
         
-        FormatTest.initialize(this, _number, _byte, _date, password);
+        FormatTest.initialize(this, number, _byte, date, password);
     }
 
     /**
@@ -37,10 +37,10 @@ class FormatTest {
      * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
      * Only for internal use.
      */
-    static initialize(obj, _number, _byte, _date, password) { 
-        obj['number'] = _number;
+    static initialize(obj, number, _byte, date, password) { 
+        obj['number'] = number;
         obj['byte'] = _byte;
-        obj['date'] = _date;
+        obj['date'] = date;
         obj['password'] = password;
     }
 
diff --git a/samples/client/petstore/javascript-es6/src/model/OuterObjectWithEnumProperty.js b/samples/client/petstore/javascript-es6/src/model/OuterObjectWithEnumProperty.js
new file mode 100644
index 000000000000..d2ef0e043715
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/src/model/OuterObjectWithEnumProperty.js
@@ -0,0 +1,74 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+import OuterEnumInteger from './OuterEnumInteger';
+
+/**
+ * The OuterObjectWithEnumProperty model module.
+ * @module model/OuterObjectWithEnumProperty
+ * @version 1.0.0
+ */
+class OuterObjectWithEnumProperty {
+    /**
+     * Constructs a new <code>OuterObjectWithEnumProperty</code>.
+     * @alias module:model/OuterObjectWithEnumProperty
+     * @param value {module:model/OuterEnumInteger} 
+     */
+    constructor(value) { 
+        
+        OuterObjectWithEnumProperty.initialize(this, value);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj, value) { 
+        obj['value'] = value;
+    }
+
+    /**
+     * Constructs a <code>OuterObjectWithEnumProperty</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/OuterObjectWithEnumProperty} obj Optional instance to populate.
+     * @return {module:model/OuterObjectWithEnumProperty} The populated <code>OuterObjectWithEnumProperty</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterObjectWithEnumProperty();
+
+            if (data.hasOwnProperty('value')) {
+                obj['value'] = OuterEnumInteger.constructFromObject(data['value']);
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {module:model/OuterEnumInteger} value
+ */
+OuterObjectWithEnumProperty.prototype['value'] = undefined;
+
+
+
+
+
+
+export default OuterObjectWithEnumProperty;
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js b/samples/client/petstore/javascript-es6/src/model/Return.js
similarity index 68%
rename from samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js
rename to samples/client/petstore/javascript-es6/src/model/Return.js
index bdfe578288a2..304ebb46f045 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/ModelReturn.js
+++ b/samples/client/petstore/javascript-es6/src/model/Return.js
@@ -14,19 +14,19 @@
 import ApiClient from '../ApiClient';
 
 /**
- * The ModelReturn model module.
- * @module model/ModelReturn
+ * The Return model module.
+ * @module model/Return
  * @version 1.0.0
  */
-class ModelReturn {
+class Return {
     /**
-     * Constructs a new <code>ModelReturn</code>.
+     * Constructs a new <code>Return</code>.
      * Model for testing reserved words
-     * @alias module:model/ModelReturn
+     * @alias module:model/Return
      */
     constructor() { 
         
-        ModelReturn.initialize(this);
+        Return.initialize(this);
     }
 
     /**
@@ -38,15 +38,15 @@ class ModelReturn {
     }
 
     /**
-     * Constructs a <code>ModelReturn</code> from a plain JavaScript object, optionally creating a new instance.
+     * Constructs a <code>Return</code> from a plain JavaScript object, optionally creating a new instance.
      * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
      * @param {Object} data The plain JavaScript object bearing properties of interest.
-     * @param {module:model/ModelReturn} obj Optional instance to populate.
-     * @return {module:model/ModelReturn} The populated <code>ModelReturn</code> instance.
+     * @param {module:model/Return} obj Optional instance to populate.
+     * @return {module:model/Return} The populated <code>Return</code> instance.
      */
     static constructFromObject(data, obj) {
         if (data) {
-            obj = obj || new ModelReturn();
+            obj = obj || new Return();
 
             if (data.hasOwnProperty('return')) {
                 obj['return'] = ApiClient.convertToType(data['return'], 'Number');
@@ -61,12 +61,12 @@ class ModelReturn {
 /**
  * @member {Number} return
  */
-ModelReturn.prototype['return'] = undefined;
+Return.prototype['return'] = undefined;
 
 
 
 
 
 
-export default ModelReturn;
+export default Return;
 
diff --git a/samples/client/petstore/javascript-es6/test/model/OuterObjectWithEnumProperty.spec.js b/samples/client/petstore/javascript-es6/test/model/OuterObjectWithEnumProperty.spec.js
new file mode 100644
index 000000000000..ea94c61358eb
--- /dev/null
+++ b/samples/client/petstore/javascript-es6/test/model/OuterObjectWithEnumProperty.spec.js
@@ -0,0 +1,65 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.OuterObjectWithEnumProperty();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterObjectWithEnumProperty', function() {
+    it('should create an instance of OuterObjectWithEnumProperty', function() {
+      // uncomment below and update the code to test OuterObjectWithEnumProperty
+      //var instane = new OpenApiPetstore.OuterObjectWithEnumProperty();
+      //expect(instance).to.be.a(OpenApiPetstore.OuterObjectWithEnumProperty);
+    });
+
+    it('should have the property value (base name: "value")', function() {
+      // uncomment below and update the code to test the property value
+      //var instance = new OpenApiPetstore.OuterObjectWithEnumProperty();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/ModelReturn.spec.js b/samples/client/petstore/javascript-es6/test/model/Return.spec.js
similarity index 81%
rename from samples/client/petstore/javascript-promise-es6/test/model/ModelReturn.spec.js
rename to samples/client/petstore/javascript-es6/test/model/Return.spec.js
index 5c995def36fb..94aa449c2788 100644
--- a/samples/client/petstore/javascript-promise-es6/test/model/ModelReturn.spec.js
+++ b/samples/client/petstore/javascript-es6/test/model/Return.spec.js
@@ -28,7 +28,7 @@
   var instance;
 
   beforeEach(function() {
-    instance = new OpenApiPetstore.ModelReturn();
+    instance = new OpenApiPetstore.Return();
   });
 
   var getProperty = function(object, getter, property) {
@@ -47,16 +47,16 @@
       object[property] = value;
   }
 
-  describe('ModelReturn', function() {
-    it('should create an instance of ModelReturn', function() {
-      // uncomment below and update the code to test ModelReturn
-      //var instane = new OpenApiPetstore.ModelReturn();
-      //expect(instance).to.be.a(OpenApiPetstore.ModelReturn);
+  describe('Return', function() {
+    it('should create an instance of Return', function() {
+      // uncomment below and update the code to test Return
+      //var instane = new OpenApiPetstore.Return();
+      //expect(instance).to.be.a(OpenApiPetstore.Return);
     });
 
     it('should have the property _return (base name: "return")', function() {
       // uncomment below and update the code to test the property _return
-      //var instane = new OpenApiPetstore.ModelReturn();
+      //var instance = new OpenApiPetstore.Return();
       //expect(instance).to.be();
     });
 
diff --git a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
index 85edf0d17173..2c4e0d99d58c 100644
--- a/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
+++ b/samples/client/petstore/javascript-promise-es6/.openapi-generator/FILES
@@ -34,7 +34,6 @@ docs/List.md
 docs/MapTest.md
 docs/MixedPropertiesAndAdditionalPropertiesClass.md
 docs/Model200Response.md
-docs/ModelReturn.md
 docs/Name.md
 docs/NullableClass.md
 docs/NumberOnly.md
@@ -44,9 +43,11 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
+docs/Return.md
 docs/SpecialModelName.md
 docs/StoreApi.md
 docs/Tag.md
@@ -92,7 +93,6 @@ src/model/List.js
 src/model/MapTest.js
 src/model/MixedPropertiesAndAdditionalPropertiesClass.js
 src/model/Model200Response.js
-src/model/ModelReturn.js
 src/model/Name.js
 src/model/NullableClass.js
 src/model/NumberOnly.js
@@ -102,8 +102,10 @@ src/model/OuterEnum.js
 src/model/OuterEnumDefaultValue.js
 src/model/OuterEnumInteger.js
 src/model/OuterEnumIntegerDefaultValue.js
+src/model/OuterObjectWithEnumProperty.js
 src/model/Pet.js
 src/model/ReadOnlyFirst.js
+src/model/Return.js
 src/model/SpecialModelName.js
 src/model/Tag.js
 src/model/User.js
diff --git a/samples/client/petstore/javascript-promise-es6/README.md b/samples/client/petstore/javascript-promise-es6/README.md
index 2f487810d006..ef092423575e 100644
--- a/samples/client/petstore/javascript-promise-es6/README.md
+++ b/samples/client/petstore/javascript-promise-es6/README.md
@@ -126,6 +126,7 @@ Class | Method | HTTP request | Description
 *OpenApiPetstore.FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *OpenApiPetstore.FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*OpenApiPetstore.FakeApi* | [**fakePropertyEnumIntegerSerialize**](docs/FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 *OpenApiPetstore.FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 *OpenApiPetstore.FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -189,7 +190,6 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.MapTest](docs/MapTest.md)
  - [OpenApiPetstore.MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
  - [OpenApiPetstore.Model200Response](docs/Model200Response.md)
- - [OpenApiPetstore.ModelReturn](docs/ModelReturn.md)
  - [OpenApiPetstore.Name](docs/Name.md)
  - [OpenApiPetstore.NullableClass](docs/NullableClass.md)
  - [OpenApiPetstore.NumberOnly](docs/NumberOnly.md)
@@ -199,8 +199,10 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [OpenApiPetstore.OuterEnumInteger](docs/OuterEnumInteger.md)
  - [OpenApiPetstore.OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [OpenApiPetstore.OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [OpenApiPetstore.Pet](docs/Pet.md)
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [OpenApiPetstore.Return](docs/Return.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
  - [OpenApiPetstore.User](docs/User.md)
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
index c910944599f8..b6c5594e0ba1 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FakeApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -293,6 +294,50 @@ No authorization required
 - **Accept**: */*
 
 
+## fakePropertyEnumIntegerSerialize
+
+> OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example
+
+```javascript
+import OpenApiPetstore from 'open_api_petstore';
+
+let apiInstance = new OpenApiPetstore.FakeApi();
+let outerObjectWithEnumProperty = new OpenApiPetstore.OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+apiInstance.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty).then((data) => {
+  console.log('API called successfully. Returned data: ' + data);
+}, (error) => {
+  console.error(error);
+});
+
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: */*
+
+
 ## testBodyWithFileSchema
 
 > testBodyWithFileSchema(fileSchemaTestClass)
@@ -427,7 +472,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -444,7 +489,7 @@ http_basic_test.username = 'YOUR USERNAME';
 http_basic_test.password = 'YOUR PASSWORD';
 
 let apiInstance = new OpenApiPetstore.FakeApi();
-let _number = 3.4; // Number | None
+let number = 3.4; // Number | None
 let _double = 3.4; // Number | None
 let patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
 let _byte = null; // Blob | None
@@ -453,14 +498,14 @@ let opts = {
   'int32': 56, // Number | None
   'int64': 789, // Number | None
   '_float': 3.4, // Number | None
-  '_string': "_string_example", // String | None
+  'string': "string_example", // String | None
   'binary': "/path/to/file", // File | None
-  '_date': new Date("2013-10-20"), // Date | None
+  'date': new Date("2013-10-20"), // Date | None
   'dateTime': new Date("2013-10-20T19:20:30+01:00"), // Date | None
   'password': "password_example", // String | None
   'callback': "callback_example" // String | None
 };
-apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts).then(() => {
+apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts).then(() => {
   console.log('API called successfully.');
 }, (error) => {
   console.error(error);
@@ -473,7 +518,7 @@ apiInstance.testEndpointParameters(_number, _double, patternWithoutDelimiter, _b
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **_number** | **Number**| None | 
+ **number** | **Number**| None | 
  **_double** | **Number**| None | 
  **patternWithoutDelimiter** | **String**| None | 
  **_byte** | **Blob**| None | 
@@ -481,9 +526,9 @@ Name | Type | Description  | Notes
  **int32** | **Number**| None | [optional] 
  **int64** | **Number**| None | [optional] 
  **_float** | **Number**| None | [optional] 
- **_string** | **String**| None | [optional] 
+ **string** | **String**| None | [optional] 
  **binary** | **File**| None | [optional] 
- **_date** | **Date**| None | [optional] 
+ **date** | **Date**| None | [optional] 
  **dateTime** | **Date**| None | [optional] 
  **password** | **String**| None | [optional] 
  **callback** | **String**| None | [optional] 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md b/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
index b6424d6230ff..c1f26210e3ec 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/FormatTest.md
@@ -7,14 +7,14 @@ Name | Type | Description | Notes
 **integer** | **Number** |  | [optional] 
 **int32** | **Number** |  | [optional] 
 **int64** | **Number** |  | [optional] 
-**_number** | **Number** |  | 
+**number** | **Number** |  | 
 **_float** | **Number** |  | [optional] 
 **_double** | **Number** |  | [optional] 
 **decimal** | **Number** |  | [optional] 
-**_string** | **String** |  | [optional] 
+**string** | **String** |  | [optional] 
 **_byte** | **Blob** |  | 
 **binary** | **File** |  | [optional] 
-**_date** | **Date** |  | 
+**date** | **Date** |  | 
 **dateTime** | **Date** |  | [optional] 
 **uuid** | **String** |  | [optional] 
 **password** | **String** |  | 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md b/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
index 19cae09524bd..3bd01f8f7d43 100644
--- a/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
+++ b/samples/client/petstore/javascript-promise-es6/docs/InlineResponseDefault.md
@@ -4,6 +4,6 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**_string** | [**Foo**](Foo.md) |  | [optional] 
+**string** | [**Foo**](Foo.md) |  | [optional] 
 
 
diff --git a/samples/client/petstore/javascript-promise-es6/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/javascript-promise-es6/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..a16331e63a6f
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.OuterObjectWithEnumProperty
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/docs/Return.md b/samples/client/petstore/javascript-promise-es6/docs/Return.md
new file mode 100644
index 000000000000..94b747a28f2c
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/docs/Return.md
@@ -0,0 +1,9 @@
+# OpenApiPetstore.Return
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Number** |  | [optional] 
+
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
index 60668b32a9af..0902c816dc4b 100644
--- a/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
+++ b/samples/client/petstore/javascript-promise-es6/src/api/FakeApi.js
@@ -17,6 +17,7 @@ import Client from '../model/Client';
 import FileSchemaTestClass from '../model/FileSchemaTestClass';
 import HealthCheckResult from '../model/HealthCheckResult';
 import OuterComposite from '../model/OuterComposite';
+import OuterObjectWithEnumProperty from '../model/OuterObjectWithEnumProperty';
 import Pet from '../model/Pet';
 import User from '../model/User';
 
@@ -309,6 +310,51 @@ export default class FakeApi {
     }
 
 
+    /**
+     * Test serialization of enum (int) properties with examples
+     * @param {module:model/OuterObjectWithEnumProperty} outerObjectWithEnumProperty Input enum (int) as post body
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/OuterObjectWithEnumProperty} and HTTP response
+     */
+    fakePropertyEnumIntegerSerializeWithHttpInfo(outerObjectWithEnumProperty) {
+      let postBody = outerObjectWithEnumProperty;
+      // verify the required parameter 'outerObjectWithEnumProperty' is set
+      if (outerObjectWithEnumProperty === undefined || outerObjectWithEnumProperty === null) {
+        throw new Error("Missing the required parameter 'outerObjectWithEnumProperty' when calling fakePropertyEnumIntegerSerialize");
+      }
+
+      let pathParams = {
+      };
+      let queryParams = {
+      };
+      let headerParams = {
+      };
+      let formParams = {
+      };
+
+      let authNames = [];
+      let contentTypes = ['application/json'];
+      let accepts = ['*/*'];
+      let returnType = OuterObjectWithEnumProperty;
+      return this.apiClient.callApi(
+        '/fake/property/enum-int', 'POST',
+        pathParams, queryParams, headerParams, formParams, postBody,
+        authNames, contentTypes, accepts, returnType, null
+      );
+    }
+
+    /**
+     * Test serialization of enum (int) properties with examples
+     * @param {module:model/OuterObjectWithEnumProperty} outerObjectWithEnumProperty Input enum (int) as post body
+     * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/OuterObjectWithEnumProperty}
+     */
+    fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty) {
+      return this.fakePropertyEnumIntegerSerializeWithHttpInfo(outerObjectWithEnumProperty)
+        .then(function(response_and_data) {
+          return response_and_data.data;
+        });
+    }
+
+
     /**
      * For this test, the body for this request much reference a schema named `File`.
      * @param {module:model/FileSchemaTestClass} fileSchemaTestClass 
@@ -454,7 +500,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -463,20 +509,20 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
      */
-    testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts) {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, opts) {
       opts = opts || {};
       let postBody = null;
-      // verify the required parameter '_number' is set
-      if (_number === undefined || _number === null) {
-        throw new Error("Missing the required parameter '_number' when calling testEndpointParameters");
+      // verify the required parameter 'number' is set
+      if (number === undefined || number === null) {
+        throw new Error("Missing the required parameter 'number' when calling testEndpointParameters");
       }
       // verify the required parameter '_double' is set
       if (_double === undefined || _double === null) {
@@ -501,14 +547,14 @@ export default class FakeApi {
         'integer': opts['integer'],
         'int32': opts['int32'],
         'int64': opts['int64'],
-        'number': _number,
+        'number': number,
         'float': opts['_float'],
         'double': _double,
-        'string': opts['_string'],
+        'string': opts['string'],
         'pattern_without_delimiter': patternWithoutDelimiter,
         'byte': _byte,
         'binary': opts['binary'],
-        'date': opts['_date'],
+        'date': opts['date'],
         'dateTime': opts['dateTime'],
         'password': opts['password'],
         'callback': opts['callback']
@@ -528,7 +574,7 @@ export default class FakeApi {
     /**
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
      * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-     * @param {Number} _number None
+     * @param {Number} number None
      * @param {Number} _double None
      * @param {String} patternWithoutDelimiter None
      * @param {Blob} _byte None
@@ -537,16 +583,16 @@ export default class FakeApi {
      * @param {Number} opts.int32 None
      * @param {Number} opts.int64 None
      * @param {Number} opts._float None
-     * @param {String} opts._string None
+     * @param {String} opts.string None
      * @param {File} opts.binary None
-     * @param {Date} opts._date None
+     * @param {Date} opts.date None
      * @param {Date} opts.dateTime None
      * @param {String} opts.password None
      * @param {String} opts.callback None
      * @return {Promise} a {@link https://www.promisejs.org/|Promise}
      */
-    testEndpointParameters(_number, _double, patternWithoutDelimiter, _byte, opts) {
-      return this.testEndpointParametersWithHttpInfo(_number, _double, patternWithoutDelimiter, _byte, opts)
+    testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, opts) {
+      return this.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, opts)
         .then(function(response_and_data) {
           return response_and_data.data;
         });
diff --git a/samples/client/petstore/javascript-promise-es6/src/index.js b/samples/client/petstore/javascript-promise-es6/src/index.js
index 33321542c648..2c5e07c03a63 100644
--- a/samples/client/petstore/javascript-promise-es6/src/index.js
+++ b/samples/client/petstore/javascript-promise-es6/src/index.js
@@ -41,7 +41,6 @@ import List from './model/List';
 import MapTest from './model/MapTest';
 import MixedPropertiesAndAdditionalPropertiesClass from './model/MixedPropertiesAndAdditionalPropertiesClass';
 import Model200Response from './model/Model200Response';
-import ModelReturn from './model/ModelReturn';
 import Name from './model/Name';
 import NullableClass from './model/NullableClass';
 import NumberOnly from './model/NumberOnly';
@@ -51,8 +50,10 @@ import OuterEnum from './model/OuterEnum';
 import OuterEnumDefaultValue from './model/OuterEnumDefaultValue';
 import OuterEnumInteger from './model/OuterEnumInteger';
 import OuterEnumIntegerDefaultValue from './model/OuterEnumIntegerDefaultValue';
+import OuterObjectWithEnumProperty from './model/OuterObjectWithEnumProperty';
 import Pet from './model/Pet';
 import ReadOnlyFirst from './model/ReadOnlyFirst';
+import Return from './model/Return';
 import SpecialModelName from './model/SpecialModelName';
 import Tag from './model/Tag';
 import User from './model/User';
@@ -271,12 +272,6 @@ export {
      */
     Model200Response,
 
-    /**
-     * The ModelReturn model constructor.
-     * @property {module:model/ModelReturn}
-     */
-    ModelReturn,
-
     /**
      * The Name model constructor.
      * @property {module:model/Name}
@@ -331,6 +326,12 @@ export {
      */
     OuterEnumIntegerDefaultValue,
 
+    /**
+     * The OuterObjectWithEnumProperty model constructor.
+     * @property {module:model/OuterObjectWithEnumProperty}
+     */
+    OuterObjectWithEnumProperty,
+
     /**
      * The Pet model constructor.
      * @property {module:model/Pet}
@@ -343,6 +344,12 @@ export {
      */
     ReadOnlyFirst,
 
+    /**
+     * The Return model constructor.
+     * @property {module:model/Return}
+     */
+    Return,
+
     /**
      * The SpecialModelName model constructor.
      * @property {module:model/SpecialModelName}
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
index 7d1944dd9c0b..00ee3533d060 100644
--- a/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
+++ b/samples/client/petstore/javascript-promise-es6/src/model/FormatTest.js
@@ -22,14 +22,14 @@ class FormatTest {
     /**
      * Constructs a new <code>FormatTest</code>.
      * @alias module:model/FormatTest
-     * @param _number {Number} 
+     * @param number {Number} 
      * @param _byte {Blob} 
-     * @param _date {Date} 
+     * @param date {Date} 
      * @param password {String} 
      */
-    constructor(_number, _byte, _date, password) { 
+    constructor(number, _byte, date, password) { 
         
-        FormatTest.initialize(this, _number, _byte, _date, password);
+        FormatTest.initialize(this, number, _byte, date, password);
     }
 
     /**
@@ -37,10 +37,10 @@ class FormatTest {
      * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
      * Only for internal use.
      */
-    static initialize(obj, _number, _byte, _date, password) { 
-        obj['number'] = _number;
+    static initialize(obj, number, _byte, date, password) { 
+        obj['number'] = number;
         obj['byte'] = _byte;
-        obj['date'] = _date;
+        obj['date'] = date;
         obj['password'] = password;
     }
 
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/OuterObjectWithEnumProperty.js b/samples/client/petstore/javascript-promise-es6/src/model/OuterObjectWithEnumProperty.js
new file mode 100644
index 000000000000..d2ef0e043715
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/OuterObjectWithEnumProperty.js
@@ -0,0 +1,74 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+import OuterEnumInteger from './OuterEnumInteger';
+
+/**
+ * The OuterObjectWithEnumProperty model module.
+ * @module model/OuterObjectWithEnumProperty
+ * @version 1.0.0
+ */
+class OuterObjectWithEnumProperty {
+    /**
+     * Constructs a new <code>OuterObjectWithEnumProperty</code>.
+     * @alias module:model/OuterObjectWithEnumProperty
+     * @param value {module:model/OuterEnumInteger} 
+     */
+    constructor(value) { 
+        
+        OuterObjectWithEnumProperty.initialize(this, value);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj, value) { 
+        obj['value'] = value;
+    }
+
+    /**
+     * Constructs a <code>OuterObjectWithEnumProperty</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/OuterObjectWithEnumProperty} obj Optional instance to populate.
+     * @return {module:model/OuterObjectWithEnumProperty} The populated <code>OuterObjectWithEnumProperty</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new OuterObjectWithEnumProperty();
+
+            if (data.hasOwnProperty('value')) {
+                obj['value'] = OuterEnumInteger.constructFromObject(data['value']);
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {module:model/OuterEnumInteger} value
+ */
+OuterObjectWithEnumProperty.prototype['value'] = undefined;
+
+
+
+
+
+
+export default OuterObjectWithEnumProperty;
+
diff --git a/samples/client/petstore/javascript-promise-es6/src/model/Return.js b/samples/client/petstore/javascript-promise-es6/src/model/Return.js
new file mode 100644
index 000000000000..304ebb46f045
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/src/model/Return.js
@@ -0,0 +1,72 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The Return model module.
+ * @module model/Return
+ * @version 1.0.0
+ */
+class Return {
+    /**
+     * Constructs a new <code>Return</code>.
+     * Model for testing reserved words
+     * @alias module:model/Return
+     */
+    constructor() { 
+        
+        Return.initialize(this);
+    }
+
+    /**
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a <code>Return</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/Return} obj Optional instance to populate.
+     * @return {module:model/Return} The populated <code>Return</code> instance.
+     */
+    static constructFromObject(data, obj) {
+        if (data) {
+            obj = obj || new Return();
+
+            if (data.hasOwnProperty('return')) {
+                obj['return'] = ApiClient.convertToType(data['return'], 'Number');
+            }
+        }
+        return obj;
+    }
+
+
+}
+
+/**
+ * @member {Number} return
+ */
+Return.prototype['return'] = undefined;
+
+
+
+
+
+
+export default Return;
+
diff --git a/samples/client/petstore/javascript-promise-es6/test/model/OuterObjectWithEnumProperty.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/OuterObjectWithEnumProperty.spec.js
new file mode 100644
index 000000000000..ea94c61358eb
--- /dev/null
+++ b/samples/client/petstore/javascript-promise-es6/test/model/OuterObjectWithEnumProperty.spec.js
@@ -0,0 +1,65 @@
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ *
+ */
+
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD.
+    define(['expect.js', process.cwd()+'/src/index'], factory);
+  } else if (typeof module === 'object' && module.exports) {
+    // CommonJS-like environments that support module.exports, like Node.
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
+  } else {
+    // Browser globals (root is window)
+    factory(root.expect, root.OpenApiPetstore);
+  }
+}(this, function(expect, OpenApiPetstore) {
+  'use strict';
+
+  var instance;
+
+  beforeEach(function() {
+    instance = new OpenApiPetstore.OuterObjectWithEnumProperty();
+  });
+
+  var getProperty = function(object, getter, property) {
+    // Use getter method if present; otherwise, get the property directly.
+    if (typeof object[getter] === 'function')
+      return object[getter]();
+    else
+      return object[property];
+  }
+
+  var setProperty = function(object, setter, property, value) {
+    // Use setter method if present; otherwise, set the property directly.
+    if (typeof object[setter] === 'function')
+      object[setter](value);
+    else
+      object[property] = value;
+  }
+
+  describe('OuterObjectWithEnumProperty', function() {
+    it('should create an instance of OuterObjectWithEnumProperty', function() {
+      // uncomment below and update the code to test OuterObjectWithEnumProperty
+      //var instane = new OpenApiPetstore.OuterObjectWithEnumProperty();
+      //expect(instance).to.be.a(OpenApiPetstore.OuterObjectWithEnumProperty);
+    });
+
+    it('should have the property value (base name: "value")', function() {
+      // uncomment below and update the code to test the property value
+      //var instance = new OpenApiPetstore.OuterObjectWithEnumProperty();
+      //expect(instance).to.be();
+    });
+
+  });
+
+}));
diff --git a/samples/client/petstore/javascript-es6/test/model/ModelReturn.spec.js b/samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js
similarity index 73%
rename from samples/client/petstore/javascript-es6/test/model/ModelReturn.spec.js
rename to samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js
index bda09c52366d..94aa449c2788 100644
--- a/samples/client/petstore/javascript-es6/test/model/ModelReturn.spec.js
+++ b/samples/client/petstore/javascript-promise-es6/test/model/Return.spec.js
@@ -2,7 +2,7 @@
  * OpenAPI Petstore
  * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -14,10 +14,10 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD.
-    define(['expect.js', '../../src/index'], factory);
+    define(['expect.js', process.cwd()+'/src/index'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    factory(require('expect.js'), require('../../src/index'));
+    factory(require('expect.js'), require(process.cwd()+'/src/index'));
   } else {
     // Browser globals (root is window)
     factory(root.expect, root.OpenApiPetstore);
@@ -28,7 +28,7 @@
   var instance;
 
   beforeEach(function() {
-    instance = new OpenApiPetstore.ModelReturn();
+    instance = new OpenApiPetstore.Return();
   });
 
   var getProperty = function(object, getter, property) {
@@ -47,16 +47,16 @@
       object[property] = value;
   }
 
-  describe('ModelReturn', function() {
-    it('should create an instance of ModelReturn', function() {
-      // uncomment below and update the code to test ModelReturn
-      //var instane = new OpenApiPetstore.ModelReturn();
-      //expect(instance).to.be.a(OpenApiPetstore.ModelReturn);
+  describe('Return', function() {
+    it('should create an instance of Return', function() {
+      // uncomment below and update the code to test Return
+      //var instane = new OpenApiPetstore.Return();
+      //expect(instance).to.be.a(OpenApiPetstore.Return);
     });
 
     it('should have the property _return (base name: "return")', function() {
       // uncomment below and update the code to test the property _return
-      //var instane = new OpenApiPetstore.ModelReturn();
+      //var instance = new OpenApiPetstore.Return();
       //expect(instance).to.be();
     });
 
diff --git a/samples/client/petstore/javascript/package-lock.json b/samples/client/petstore/javascript/package-lock.json
new file mode 100644
index 000000000000..ffa052e5d076
--- /dev/null
+++ b/samples/client/petstore/javascript/package-lock.json
@@ -0,0 +1,364 @@
+{
+  "name": "open_api_petstore",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.3.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/commander/-/commander-2.3.0.tgz",
+      "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY="
+    },
+    "cookiejar": {
+      "version": "2.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/cookiejar/-/cookiejar-2.1.2.tgz",
+      "integrity": "sha1-3YojVTB1L5iPmghE8/xYnjERElw="
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
+    },
+    "debug": {
+      "version": "3.1.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/debug/-/debug-3.1.0.tgz",
+      "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=",
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+      "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+      "dev": true
+    },
+    "expect.js": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
+      "integrity": "sha1-sKWaDS7/VDdUTr8M6qYBWEHQm1s=",
+      "dev": true
+    },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "formatio": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz",
+      "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=",
+      "dev": true,
+      "requires": {
+        "samsam": "~1.1"
+      }
+    },
+    "formidable": {
+      "version": "1.2.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/formidable/-/formidable-1.2.1.tgz",
+      "integrity": "sha1-cPt8oCkO5v+WEJBBX0s989IIJlk="
+    },
+    "glob": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+      "integrity": "sha1-4xPusknHr/qlxHUoaw4RW1mDlGc=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "~2.0.0",
+        "inherits": "2",
+        "minimatch": "~0.2.11"
+      }
+    },
+    "graceful-fs": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+      "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
+      "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg=",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
+    },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+          "dev": true
+        }
+      }
+    },
+    "lolex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz",
+      "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=",
+      "dev": true
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+      "dev": true
+    },
+    "methods": {
+      "version": "1.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha1-Ms2eXGRVO9WNGaVor0Uqz/BJgbE="
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha1-BWnWV0ZkkSg3CWY603mpm5DZq0c="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha1-ceRkU3p++BwV8tudl+kT/A/2BvA=",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2",
+        "sigmund": "~1.0.0"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+      "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.3.4.tgz",
+      "integrity": "sha1-himm+wRPLSJapLgaKuLQAWmesmY=",
+      "dev": true,
+      "requires": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.3",
+        "growl": "1.8.1",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.0",
+        "supports-color": "1.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha1-o31zL0JxtKsa0HDTVQjoKQeI/6o="
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY="
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=",
+      "requires": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0="
+    },
+    "samsam": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
+      "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=",
+      "dev": true
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "sinon": {
+      "version": "1.17.3",
+      "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.3.tgz",
+      "integrity": "sha1-RNZLx0jQI4gARsFUPO/Oo0xH0X4=",
+      "dev": true,
+      "requires": {
+        "formatio": "1.1.1",
+        "lolex": "1.3.2",
+        "samsam": "1.1.2",
+        "util": ">=0.10.3 <1"
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=",
+      "requires": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "superagent": {
+      "version": "3.7.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/superagent/-/superagent-3.7.0.tgz",
+      "integrity": "sha1-vVi/3iy8UwWtucy7bay6GECGKdY=",
+      "requires": {
+        "component-emitter": "^1.2.0",
+        "cookiejar": "^2.1.0",
+        "debug": "^3.1.0",
+        "extend": "^3.0.0",
+        "form-data": "^2.3.1",
+        "formidable": "^1.1.1",
+        "methods": "^1.1.1",
+        "mime": "^1.4.1",
+        "qs": "^6.5.1",
+        "readable-stream": "^2.0.5"
+      }
+    },
+    "supports-color": {
+      "version": "1.2.0",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/supports-color/-/supports-color-1.2.0.tgz",
+      "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+      "dev": true
+    },
+    "util": {
+      "version": "0.10.3",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/util/-/util-0.10.3.tgz",
+      "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+      "dev": true,
+      "requires": {
+        "inherits": "2.0.1"
+      },
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/inherits/-/inherits-2.0.1.tgz",
+          "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://artifactory.sri.com/artifactory/api/npm/Sunflower-NPM-all/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
+    }
+  }
+}
diff --git a/samples/client/petstore/jmeter/.openapi-generator/FILES b/samples/client/petstore/jmeter/.openapi-generator/FILES
new file mode 100644
index 000000000000..87541f4daaa9
--- /dev/null
+++ b/samples/client/petstore/jmeter/.openapi-generator/FILES
@@ -0,0 +1,6 @@
+PetApi.csv
+PetApi.jmx
+StoreApi.csv
+StoreApi.jmx
+UserApi.csv
+UserApi.jmx
diff --git a/samples/client/petstore/jmeter/.openapi-generator/VERSION b/samples/client/petstore/jmeter/.openapi-generator/VERSION
index 82602aa4190d..c30f0ec2be7f 100644
--- a/samples/client/petstore/jmeter/.openapi-generator/VERSION
+++ b/samples/client/petstore/jmeter/.openapi-generator/VERSION
@@ -1 +1 @@
-3.0.3-SNAPSHOT
\ No newline at end of file
+5.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/jmeter/PetApi.jmx b/samples/client/petstore/jmeter/PetApi.jmx
index 6fdef6ad04ec..fa9c1963bede 100644
--- a/samples/client/petstore/jmeter/PetApi.jmx
+++ b/samples/client/petstore/jmeter/PetApi.jmx
@@ -198,7 +198,7 @@
         <HeaderManager guiclass="HeaderPanel" testclass="HeaderManager" testname="HTTP Header Manager" enabled="true">
           <collectionProp name="HeaderManager.headers">
             <elementProp name="" elementType="Header">
-              <stringProp name="Header.name">apiKey</stringProp>
+              <stringProp name="Header.name">api_key</stringProp>
               <stringProp name="Header.value">${__RandomString(10,qwertyuiopasdfghjklzxcvbnm)}</stringProp>
             </elementProp>
             <elementProp name="" elementType="Header">
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..bcbb1cf86273
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.gson.toJson(content, T::class.java).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.gson.fromJson(bodyContent, T::class.java)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.gson.toJson(value, T::class.java).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..6120b081929d
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,33 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+
+class ByteArrayAdapter : TypeAdapter<ByteArray>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: ByteArray?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(String(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): ByteArray? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return out.nextString().toByteArray()
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt
new file mode 100644
index 000000000000..c5d330ac0757
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt
@@ -0,0 +1,37 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class DateAdapter(val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())) : TypeAdapter<Date>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: Date?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): Date? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return formatter.parse(out.nextString())
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..30ef6697183a
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE) : TypeAdapter<LocalDate>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: LocalDate?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): LocalDate? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return LocalDate.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..3ad781c66ca1
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME) : TypeAdapter<LocalDateTime>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: LocalDateTime?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): LocalDateTime? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return LocalDateTime.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..e615135c9cc0
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME) : TypeAdapter<OffsetDateTime>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: OffsetDateTime?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): OffsetDateTime? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return OffsetDateTime.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..b80e0390de2d
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.util.UUID
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val gsonBuilder: GsonBuilder = GsonBuilder()
+        .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
+        .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
+        .registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())
+        .registerTypeAdapter(ByteArray::class.java, ByteArrayAdapter())
+    
+    @JvmStatic
+    val gson: Gson by lazy {
+        gsonBuilder.create()
+    }
+}
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..54df813fceec
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..fdefa74fda0b
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..049c89df3134
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @SerializedName(value = "placed") placed("placed"),
+        @SerializedName(value = "approved") approved("approved"),
+        @SerializedName(value = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..af29ef2b61b7
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @SerializedName(value = "available") available("available"),
+        @SerializedName(value = "pending") pending("pending"),
+        @SerializedName(value = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..28e82b1df685
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..62baf33e927e
--- /dev/null
+++ b/samples/client/petstore/kotlin-gson/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..637ca64c247b
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.jacksonObjectMapper.writeValueAsString(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.jacksonObjectMapper.readValue(bodyContent, T::class.java)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.jacksonObjectMapper.writeValueAsString(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..fff39c7ac243
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,3 @@
+package org.openapitools.client.infrastructure
+
+
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..8b34e629c4ec
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,18 @@
+package org.openapitools.client.infrastructure
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.annotation.JsonInclude
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val jacksonObjectMapper: ObjectMapper = jacksonObjectMapper()
+        .registerModule(Jdk8Module())
+        .registerModule(JavaTimeModule())
+        .setSerializationInclusion(JsonInclude.Include.NON_ABSENT)
+        .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
+}
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..c341f8ca321b
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..2ed5390c1f3a
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..c7df5b55614b
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @JsonProperty(value = "placed") PLACED("placed"),
+        @JsonProperty(value = "approved") APPROVED("approved"),
+        @JsonProperty(value = "delivered") DELIVERED("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..be5b168e2d8b
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @JsonProperty(value = "available") AVAILABLE("available"),
+        @JsonProperty(value = "pending") PENDING("pending"),
+        @JsonProperty(value = "sold") SOLD("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..7243f42ed7d8
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..e8f639e50928
--- /dev/null
+++ b/samples/client/petstore/kotlin-jackson/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.fasterxml.jackson.annotation.JsonProperty
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..d939e3d5a43e
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,494 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get all pets
+    * 
+    * @param lastUpdated When this endpoint was hit last to help indentify if the client already has the latest copy. (optional)
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getAllPets(lastUpdated: java.time.OffsetDateTime?) : kotlin.collections.List<Pet> {
+        val localVariableConfig = getAllPetsRequestConfig(lastUpdated = lastUpdated)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getAllPets
+    *
+    * @param lastUpdated When this endpoint was hit last to help indentify if the client already has the latest copy. (optional)
+    * @return RequestConfig
+    */
+    fun getAllPetsRequestConfig(lastUpdated: java.time.OffsetDateTime?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                if (lastUpdated != null) {
+                    put("lastUpdated", listOf(parseDateToQueryString(lastUpdated)))
+                }
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/getAll",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..e1d5bc9c412c
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,245 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        return value.toString()
+    }
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fafca8738f66
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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-json-request-string/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..a4c17c3b49dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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-json-request-string/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..a66c335904e7
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..a3df06cb6eb3
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..6e619023a5c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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-json-request-string/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..af1e270325de
--- /dev/null
+++ b/samples/client/petstore/kotlin-json-request-string/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..78223583f645
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    suspend fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..4ab794d66081
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..911bbee5b6b3
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    suspend fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..bcbb1cf86273
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.gson.toJson(content, T::class.java).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.gson.fromJson(bodyContent, T::class.java)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.gson.toJson(value, T::class.java).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..6120b081929d
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,33 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+
+class ByteArrayAdapter : TypeAdapter<ByteArray>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: ByteArray?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(String(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): ByteArray? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return out.nextString().toByteArray()
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt
new file mode 100644
index 000000000000..c5d330ac0757
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/DateAdapter.kt
@@ -0,0 +1,37 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+class DateAdapter(val formatter: DateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ", Locale.getDefault())) : TypeAdapter<Date>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: Date?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): Date? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return formatter.parse(out.nextString())
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..30ef6697183a
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE) : TypeAdapter<LocalDate>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: LocalDate?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): LocalDate? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return LocalDate.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..3ad781c66ca1
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME) : TypeAdapter<LocalDateTime>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: LocalDateTime?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): LocalDateTime? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return LocalDateTime.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..e615135c9cc0
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,35 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.TypeAdapter
+import com.google.gson.stream.JsonReader
+import com.google.gson.stream.JsonWriter
+import com.google.gson.stream.JsonToken.NULL
+import java.io.IOException
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter(private val formatter: DateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME) : TypeAdapter<OffsetDateTime>() {
+    @Throws(IOException::class)
+    override fun write(out: JsonWriter?, value: OffsetDateTime?) {
+        if (value == null) {
+            out?.nullValue()
+        } else {
+            out?.value(formatter.format(value))
+        }
+    }
+
+    @Throws(IOException::class)
+    override fun read(out: JsonReader?): OffsetDateTime? {
+        out ?: return null
+
+        when (out.peek()) {
+            NULL -> {
+                out.nextNull()
+                return null
+            }
+            else -> {
+                return OffsetDateTime.parse(out.nextString(), formatter)
+            }
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..b80e0390de2d
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.OffsetDateTime
+import java.util.UUID
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val gsonBuilder: GsonBuilder = GsonBuilder()
+        .registerTypeAdapter(OffsetDateTime::class.java, OffsetDateTimeAdapter())
+        .registerTypeAdapter(LocalDateTime::class.java, LocalDateTimeAdapter())
+        .registerTypeAdapter(LocalDate::class.java, LocalDateAdapter())
+        .registerTypeAdapter(ByteArray::class.java, ByteArrayAdapter())
+    
+    @JvmStatic
+    val gson: Gson by lazy {
+        gsonBuilder.create()
+    }
+}
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fc89bf34e7fc
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,38 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..b483bee69b3e
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..d6bacf867c47
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,58 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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
+    }
+
+    /**
+    * Order Status
+    * Values: placed,approved,delivered
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @SerializedName(value = "placed") placed("placed"),
+        @SerializedName(value = "approved") approved("approved"),
+        @SerializedName(value = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..afa65785d387
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,60 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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
+    }
+
+    /**
+    * pet status in the store
+    * Values: available,pending,sold
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @SerializedName(value = "available") available("available"),
+        @SerializedName(value = "pending") pending("pending"),
+        @SerializedName(value = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..a1a282cb38df
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..59ba0254f603
--- /dev/null
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.google.gson.annotations.SerializedName
+import java.io.Serializable
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..7a8dcc91cd4b
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..25447c818e66
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..18d2ce3dbbe7
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,33 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..8396fa423574
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,30 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..d7091dd4c0c2
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,55 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+@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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..8b4e6b44d4cc
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,57 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+@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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..e7cdab2bb5df
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,30 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..1bfad8449046
--- /dev/null
+++ b/samples/client/petstore/kotlin-moshi-codegen/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,49 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+@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-nonpublic/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..b6b38fa42f34
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+internal class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..19b7acdbd31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+internal class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..979bb1b81f86
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+internal class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..d26cda9091ca
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+internal typealias MultiValueMap = MutableMap<String,List<String>>
+
+internal fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+internal val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+internal fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+internal fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..c4da8e3989b8
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+internal open class ApiClient(val baseUrl: String) {
+    internal companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..c618544573e4
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+internal enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+internal interface Response
+
+internal abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+internal class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+internal class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+internal class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+internal class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+internal class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..d7f9079c0d54
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+internal object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..86bcb51fba6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+internal class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..204b69dcb08e
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+internal open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    internal companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+internal open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    internal companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..e86215d5717d
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+internal class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..fe7069904ca3
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+internal class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..be7703c103d2
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+internal class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..68f41c5497dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+internal data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..e0fbb1e6526c
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+internal enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..858d1b7339b4
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+internal val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+internal val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+internal val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+internal val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..7265f7591428
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+internal object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..02fa692b57dc
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+internal class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..a695278dfa3c
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..376994a9b250
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..a943b97c1ea3
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..544fab20f5a7
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..d9b84e93eafd
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..e0e821cd7e38
--- /dev/null
+++ b/samples/client/petstore/kotlin-nonpublic/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..95f695cb9f48
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet> or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet>? {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet> or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet>? {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet? {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse? {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..c442f8661003
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int> or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int>? {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order? {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order? {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..6e6c329144cc
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User? {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String or null
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String? {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String?
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..7a8dcc91cd4b
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..77066de4e559
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T?,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..7d40c8efbc2f
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,38 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..ceb0fbc8fe60
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..ed8f8b13a43b
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,58 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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
+    }
+
+    /**
+    * Order Status
+    * Values: placed,approved,delivered
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..105f485f021d
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,60 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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
+    }
+
+    /**
+    * pet status in the store
+    * Values: available,pending,sold
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..944b1cd0a141
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..9697f07d5bf8
--- /dev/null
+++ b/samples/client/petstore/kotlin-nullable/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..9d526273d7ac
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,249 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.MediaType
+import okhttp3.FormBody
+import okhttp3.HttpUrl
+import okhttp3.ResponseBody
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> RequestBody.create(
+                MediaType.parse(mediaType), content
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.of(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = MediaType.parse(guessContentTypeFromFile(value))
+                                addPart(partHeaders, RequestBody.create(fileMediaType, value))
+                            } else {
+                                val partHeaders = Headers.of(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    RequestBody.create(null, parameterToString(value))
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> RequestBody.create(
+                MediaType.parse(mediaType), Serializer.moshi.adapter(T::class.java).toJson(content)
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = HttpUrl.parse(baseUrl) ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code(),
+                    response.headers().toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message(),
+                    response.code(),
+                    response.headers().toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body(), accept),
+                    response.code(),
+                    response.headers().toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message(),
+                    response.body()?.string(),
+                    response.code(),
+                    response.headers().toMultimap()
+            )
+            else -> return ServerError(
+                    response.message(),
+                    response.body()?.string(),
+                    response.code(),
+                    response.headers().toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..037fedbd18bd
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code() in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code() in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code() in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code() in 500..999
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fafca8738f66
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..a4c17c3b49dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..a66c335904e7
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..a3df06cb6eb3
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..6e619023a5c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..af1e270325de
--- /dev/null
+++ b/samples/client/petstore/kotlin-okhttp3/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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-rx3/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..90e791f37afa
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,125 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import okhttp3.RequestBody
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.Completable;
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import okhttp3.MultipartBody
+
+interface PetApi {
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return [Call]<[Unit]>
+     */
+    @POST("pet")
+    fun addPet(@Body body: Pet): Completable
+
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("pet/{petId}")
+    fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Completable
+
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+     * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
+    @GET("pet/findByStatus")
+    fun findPetsByStatus(@Query("status") status: CSVParams): Single<kotlin.collections.List<Pet>>
+
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+     * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
+    @Deprecated("This api was deprecated")
+    @GET("pet/findByTags")
+    fun findPetsByTags(@Query("tags") tags: CSVParams): Single<kotlin.collections.List<Pet>>
+
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+     * @return [Call]<[Pet]>
+     */
+    @GET("pet/{petId}")
+    fun getPetById(@Path("petId") petId: kotlin.Long): Single<Pet>
+
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return [Call]<[Unit]>
+     */
+    @PUT("pet")
+    fun updatePet(@Body body: Pet): Completable
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @return [Call]<[Unit]>
+     */
+    @FormUrlEncoded
+    @POST("pet/{petId}")
+    fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Completable
+
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return [Call]<[ApiResponse]>
+     */
+    @Multipart
+    @POST("pet/{petId}/uploadImage")
+    fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Single<ApiResponse>
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..11acb2eb8b70
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,63 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import okhttp3.RequestBody
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.Completable;
+
+import org.openapitools.client.models.Order
+
+interface StoreApi {
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("store/order/{orderId}")
+    fun deleteOrder(@Path("orderId") orderId: kotlin.String): Completable
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @return [Call]<[kotlin.collections.Map<kotlin.String, kotlin.Int>]>
+     */
+    @GET("store/inventory")
+    fun getInventory(): Single<kotlin.collections.Map<kotlin.String, kotlin.Int>>
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+     * @return [Call]<[Order]>
+     */
+    @GET("store/order/{orderId}")
+    fun getOrderById(@Path("orderId") orderId: kotlin.Long): Single<Order>
+
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param body order placed for purchasing the pet 
+     * @return [Call]<[Order]>
+     */
+    @POST("store/order")
+    fun placeOrder(@Body body: Order): Single<Order>
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..d6fad78e88f3
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,114 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import okhttp3.RequestBody
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.core.Completable;
+
+import org.openapitools.client.models.User
+
+interface UserApi {
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body Created user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user")
+    fun createUser(@Body body: User): Completable
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithArray")
+    fun createUsersWithArrayInput(@Body body: kotlin.collections.List<User>): Completable
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithList")
+    fun createUsersWithListInput(@Body body: kotlin.collections.List<User>): Completable
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("user/{username}")
+    fun deleteUser(@Path("username") username: kotlin.String): Completable
+
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     * @return [Call]<[User]>
+     */
+    @GET("user/{username}")
+    fun getUserByName(@Path("username") username: kotlin.String): Single<User>
+
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+     * @return [Call]<[kotlin.String]>
+     */
+    @GET("user/login")
+    fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Single<kotlin.String>
+
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @return [Call]<[Unit]>
+     */
+    @GET("user/logout")
+    fun logoutUser(): Completable
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param body Updated user object 
+     * @return [Call]<[Unit]>
+     */
+    @PUT("user/{username}")
+    fun updateUser(@Path("username") username: kotlin.String, @Body body: User): Completable
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuth.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthFlow.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..30f649932fc3
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,203 @@
+package org.openapitools.client.infrastructure
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory
+import com.squareup.moshi.Moshi
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+class ApiClient(
+    private var baseUrl: String = defaultBasePath,
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+    private val okHttpClient : OkHttpClient? = null
+) {
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+
+            .addCallAdapterFactory(RxJava3CallAdapterFactory.create())
+            .addConverterFactory(MoshiConverterFactory.create(serializerBuilder.build()))
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
+    }
+
+    init {
+        normalizeBaseUrl()
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authName: String,
+        clientId: String,
+        secret: String,
+        username: String,
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
+    }
+
+    fun <S> createService(serviceClass: Class<S>): S {
+        val usedClient = this.okHttpClient ?: clientBuilder.build()
+        return retrofitBuilder.client(usedClient).build().create(serviceClass)
+    }
+
+    private fun normalizeBaseUrl() {
+        if (!baseUrl.endsWith("/")) {
+            baseUrl += "/"
+        }
+    }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt
new file mode 100644
index 000000000000..001e99325d2e
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt
@@ -0,0 +1,56 @@
+package org.openapitools.client.infrastructure
+
+class CollectionFormats {
+
+    open class CSVParams {
+
+        var params: List<String>
+
+        constructor(params: List<String>) {
+            this.params = params
+        }
+
+        constructor(vararg params: String) {
+            this.params = listOf(*params)
+        }
+
+        override fun toString(): String {
+            return params.joinToString(",")
+        }
+    }
+
+    open class SSVParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString(" ")
+        }
+    }
+
+    class TSVParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString("\t")
+        }
+    }
+
+    class PIPESParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString("|")
+        }
+    }
+
+    class SPACEParams : SSVParams()
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..1804d1ae2bbd
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,16 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.Moshi
+import retrofit2.Response
+
+@Throws(JsonDataException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: Moshi.Builder = Serializer.moshiBuilder): T? {
+    val serializer = serializerBuilder.build()
+    val parser = serializer.adapter(T::class.java)
+    val response = errorBody()?.string()
+    if(response != null) {
+        return parser.fromJson(response)
+    }
+    return null
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fafca8738f66
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..a4c17c3b49dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..a66c335904e7
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..a3df06cb6eb3
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..6e619023a5c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..af1e270325de
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..e8b980bc8727
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,124 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import retrofit2.Call
+import okhttp3.RequestBody
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import okhttp3.MultipartBody
+
+interface PetApi {
+    /**
+     * Add a new pet to the store
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return [Call]<[Unit]>
+     */
+    @POST("pet")
+    fun addPet(@Body body: Pet): Call<Unit>
+
+    /**
+     * Deletes a pet
+     * 
+     * Responses:
+     *  - 400: Invalid pet value
+     * 
+     * @param petId Pet id to delete 
+     * @param apiKey  (optional)
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("pet/{petId}")
+    fun deletePet(@Path("petId") petId: kotlin.Long, @Header("api_key") apiKey: kotlin.String): Call<Unit>
+
+    /**
+     * Finds Pets by status
+     * Multiple status values can be provided with comma separated strings
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid status value
+     * 
+     * @param status Status values that need to be considered for filter 
+     * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
+    @GET("pet/findByStatus")
+    fun findPetsByStatus(@Query("status") status: CSVParams): Call<kotlin.collections.List<Pet>>
+
+    /**
+     * Finds Pets by tags
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid tag value
+     * 
+     * @param tags Tags to filter by 
+     * @return [Call]<[kotlin.collections.List<Pet>]>
+     */
+    @Deprecated("This api was deprecated")
+    @GET("pet/findByTags")
+    fun findPetsByTags(@Query("tags") tags: CSVParams): Call<kotlin.collections.List<Pet>>
+
+    /**
+     * Find pet by ID
+     * Returns a single pet
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     * 
+     * @param petId ID of pet to return 
+     * @return [Call]<[Pet]>
+     */
+    @GET("pet/{petId}")
+    fun getPetById(@Path("petId") petId: kotlin.Long): Call<Pet>
+
+    /**
+     * Update an existing pet
+     * 
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Pet not found
+     *  - 405: Validation exception
+     * 
+     * @param body Pet object that needs to be added to the store 
+     * @return [Call]<[Unit]>
+     */
+    @PUT("pet")
+    fun updatePet(@Body body: Pet): Call<Unit>
+
+    /**
+     * Updates a pet in the store with form data
+     * 
+     * Responses:
+     *  - 405: Invalid input
+     * 
+     * @param petId ID of pet that needs to be updated 
+     * @param name Updated name of the pet (optional)
+     * @param status Updated status of the pet (optional)
+     * @return [Call]<[Unit]>
+     */
+    @FormUrlEncoded
+    @POST("pet/{petId}")
+    fun updatePetWithForm(@Path("petId") petId: kotlin.Long, @Field("name") name: kotlin.String, @Field("status") status: kotlin.String): Call<Unit>
+
+    /**
+     * uploads an image
+     * 
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @param petId ID of pet to update 
+     * @param additionalMetadata Additional data to pass to server (optional)
+     * @param file file to upload (optional)
+     * @return [Call]<[ApiResponse]>
+     */
+    @Multipart
+    @POST("pet/{petId}/uploadImage")
+    fun uploadFile(@Path("petId") petId: kotlin.Long, @Part("additionalMetadata") additionalMetadata: kotlin.String, @Part file: MultipartBody.Part): Call<ApiResponse>
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..be05f2bb6968
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,62 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import retrofit2.Call
+import okhttp3.RequestBody
+
+import org.openapitools.client.models.Order
+
+interface StoreApi {
+    /**
+     * Delete purchase order by ID
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * Responses:
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of the order that needs to be deleted 
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("store/order/{orderId}")
+    fun deleteOrder(@Path("orderId") orderId: kotlin.String): Call<Unit>
+
+    /**
+     * Returns pet inventories by status
+     * Returns a map of status codes to quantities
+     * Responses:
+     *  - 200: successful operation
+     * 
+     * @return [Call]<[kotlin.collections.Map<kotlin.String, kotlin.Int>]>
+     */
+    @GET("store/inventory")
+    fun getInventory(): Call<kotlin.collections.Map<kotlin.String, kotlin.Int>>
+
+    /**
+     * Find purchase order by ID
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid ID supplied
+     *  - 404: Order not found
+     * 
+     * @param orderId ID of pet that needs to be fetched 
+     * @return [Call]<[Order]>
+     */
+    @GET("store/order/{orderId}")
+    fun getOrderById(@Path("orderId") orderId: kotlin.Long): Call<Order>
+
+    /**
+     * Place an order for a pet
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid Order
+     * 
+     * @param body order placed for purchasing the pet 
+     * @return [Call]<[Order]>
+     */
+    @POST("store/order")
+    fun placeOrder(@Body body: Order): Call<Order>
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..66c1e7fbd264
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,113 @@
+package org.openapitools.client.apis
+
+import org.openapitools.client.infrastructure.CollectionFormats.*
+import retrofit2.http.*
+import retrofit2.Call
+import okhttp3.RequestBody
+
+import org.openapitools.client.models.User
+
+interface UserApi {
+    /**
+     * Create user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body Created user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user")
+    fun createUser(@Body body: User): Call<Unit>
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithArray")
+    fun createUsersWithArrayInput(@Body body: kotlin.collections.List<User>): Call<Unit>
+
+    /**
+     * Creates list of users with given input array
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @param body List of user object 
+     * @return [Call]<[Unit]>
+     */
+    @POST("user/createWithList")
+    fun createUsersWithListInput(@Body body: kotlin.collections.List<User>): Call<Unit>
+
+    /**
+     * Delete user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be deleted 
+     * @return [Call]<[Unit]>
+     */
+    @DELETE("user/{username}")
+    fun deleteUser(@Path("username") username: kotlin.String): Call<Unit>
+
+    /**
+     * Get user by user name
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username supplied
+     *  - 404: User not found
+     * 
+     * @param username The name that needs to be fetched. Use user1 for testing. 
+     * @return [Call]<[User]>
+     */
+    @GET("user/{username}")
+    fun getUserByName(@Path("username") username: kotlin.String): Call<User>
+
+    /**
+     * Logs user into the system
+     * 
+     * Responses:
+     *  - 200: successful operation
+     *  - 400: Invalid username/password supplied
+     * 
+     * @param username The user name for login 
+     * @param password The password for login in clear text 
+     * @return [Call]<[kotlin.String]>
+     */
+    @GET("user/login")
+    fun loginUser(@Query("username") username: kotlin.String, @Query("password") password: kotlin.String): Call<kotlin.String>
+
+    /**
+     * Logs out current logged in user session
+     * 
+     * Responses:
+     *  - 0: successful operation
+     * 
+     * @return [Call]<[Unit]>
+     */
+    @GET("user/logout")
+    fun logoutUser(): Call<Unit>
+
+    /**
+     * Updated user
+     * This can only be done by the logged in user.
+     * Responses:
+     *  - 400: Invalid user supplied
+     *  - 404: User not found
+     * 
+     * @param username name that need to be deleted 
+     * @param body Updated user object 
+     * @return [Call]<[Unit]>
+     */
+    @PUT("user/{username}")
+    fun updateUser(@Path("username") username: kotlin.String, @Body body: User): Call<Unit>
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt
new file mode 100644
index 000000000000..524d5190ef88
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/ApiKeyAuth.kt
@@ -0,0 +1,50 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+
+import okhttp3.Interceptor
+import okhttp3.Response
+
+class ApiKeyAuth(
+        private val location: String = "",
+        private val paramName: String = "",
+        private var apiKey: String = ""
+) : Interceptor {
+    
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+
+        if ("query" == location) {
+            var newQuery = request.url.toUri().query
+            val paramValue = "$paramName=$apiKey"
+            if (newQuery == null) {
+                newQuery = paramValue
+            } else {
+                newQuery += "&$paramValue"
+            }
+
+            val newUri: URI
+            try {
+                val oldUri = request.url.toUri()
+                newUri = URI(oldUri.scheme, oldUri.authority,
+                    oldUri.path, newQuery, oldUri.fragment)
+            } catch (e: URISyntaxException) {
+                throw IOException(e)
+            }
+
+            request = request.newBuilder().url(newUri.toURL()).build()
+        } else if ("header" == location) {
+            request = request.newBuilder()
+                    .addHeader(paramName, apiKey)
+                    .build()
+        } else if ("cookie" == location) {
+            request = request.newBuilder()
+                    .addHeader("Cookie", "$paramName=$apiKey")
+                    .build()
+        }
+        return chain.proceed(request)
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuth.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuth.kt
new file mode 100644
index 000000000000..311a8f439794
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuth.kt
@@ -0,0 +1,151 @@
+package org.openapitools.client.auth
+
+import java.net.HttpURLConnection.HTTP_UNAUTHORIZED
+import java.net.HttpURLConnection.HTTP_FORBIDDEN
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.OAuthClient
+import org.apache.oltu.oauth2.client.request.OAuthBearerClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+import org.apache.oltu.oauth2.common.message.types.GrantType
+import org.apache.oltu.oauth2.common.token.BasicOAuthToken
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+
+class OAuth(
+        client: OkHttpClient,
+        var tokenRequestBuilder: TokenRequestBuilder
+) : Interceptor {
+
+    interface AccessTokenListener {
+        fun notify(token: BasicOAuthToken)
+    }
+
+    private var oauthClient: OAuthClient = OAuthClient(OAuthOkHttpClient(client))
+
+    @Volatile 
+    private var accessToken: String? = null
+    var authenticationRequestBuilder: AuthenticationRequestBuilder? = null
+    private var accessTokenListener: AccessTokenListener? = null
+
+    constructor(
+            requestBuilder: TokenRequestBuilder
+    ) : this(
+            OkHttpClient(), 
+            requestBuilder
+    )
+
+    constructor(
+            flow: OAuthFlow, 
+            authorizationUrl: String, 
+            tokenUrl: String, 
+            scopes: String
+    ) : this(
+            OAuthClientRequest.tokenLocation(tokenUrl).setScope(scopes)
+    ) {
+        setFlow(flow);
+        authenticationRequestBuilder = OAuthClientRequest.authorizationLocation(authorizationUrl);
+    }
+
+    fun setFlow(flow: OAuthFlow) {
+        when (flow) {
+            OAuthFlow.accessCode, OAuthFlow.implicit ->
+                tokenRequestBuilder.setGrantType(GrantType.AUTHORIZATION_CODE)
+            OAuthFlow.password ->
+                tokenRequestBuilder.setGrantType(GrantType.PASSWORD)
+            OAuthFlow.application ->
+                tokenRequestBuilder.setGrantType(GrantType.CLIENT_CREDENTIALS)
+        }            
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        return retryingIntercept(chain, true)
+    }
+
+    @Throws(IOException::class)
+    private fun retryingIntercept(chain: Interceptor.Chain, updateTokenAndRetryOnAuthorizationFailure: Boolean): Response {
+        var request = chain.request()
+
+        // If the request already have an authorization (eg. Basic auth), do nothing
+        if (request.header("Authorization") != null) {
+            return chain.proceed(request)
+        }
+
+        // If first time, get the token
+        val oAuthRequest: OAuthClientRequest
+        if (accessToken == null) {
+            updateAccessToken(null)
+        }
+
+        if (accessToken != null) {
+            // Build the request
+            val rb = request.newBuilder()
+
+            val requestAccessToken = accessToken
+            try {
+                oAuthRequest = OAuthBearerClientRequest(request.url.toString())
+                        .setAccessToken(requestAccessToken)
+                        .buildHeaderMessage()
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            }
+
+            oAuthRequest.headers.entries.forEach { header ->
+                rb.addHeader(header.key, header.value)
+            }
+            rb.url(oAuthRequest.locationUri)
+
+            //Execute the request
+            val response = chain.proceed(rb.build())
+
+            // 401/403 most likely indicates that access token has expired. Unless it happens two times in a row.
+            if ((response.code == HTTP_UNAUTHORIZED || response.code == HTTP_FORBIDDEN) && updateTokenAndRetryOnAuthorizationFailure) {
+                try {
+                    if (updateAccessToken(requestAccessToken)) {
+                        response.body?.close()
+                        return retryingIntercept(chain, false)
+                    }
+                } catch (e: Exception) {
+                    response.body?.close()
+                    throw e
+                }
+            }
+            return response
+        } else {
+            return chain.proceed(chain.request())
+        }
+    }
+
+    /**
+     * Returns true if the access token has been updated
+     */
+    @Throws(IOException::class)
+    @Synchronized 
+    fun updateAccessToken(requestAccessToken: String?): Boolean {
+        if (accessToken == null || accessToken.equals(requestAccessToken)) {    
+            return try {
+                val accessTokenResponse = oauthClient.accessToken(this.tokenRequestBuilder.buildBodyMessage())
+                if (accessTokenResponse != null && accessTokenResponse.accessToken != null) {
+                    accessToken = accessTokenResponse.accessToken
+                    accessTokenListener?.notify(accessTokenResponse.oAuthToken as BasicOAuthToken)
+                    !accessToken.equals(requestAccessToken)
+                } else {
+                    false
+                }
+            } catch (e: OAuthSystemException) {
+                throw IOException(e)
+            } catch (e: OAuthProblemException) {
+                throw IOException(e)
+            }
+        }
+        return true;
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthFlow.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthFlow.kt
new file mode 100644
index 000000000000..bcada9b7a6a2
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthFlow.kt
@@ -0,0 +1,5 @@
+package org.openapitools.client.auth
+
+enum class OAuthFlow {
+    accessCode, implicit, password, application
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt
new file mode 100644
index 000000000000..93adbda3fc98
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/auth/OAuthOkHttpClient.kt
@@ -0,0 +1,61 @@
+package org.openapitools.client.auth
+
+import java.io.IOException
+
+import org.apache.oltu.oauth2.client.HttpClient
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest
+import org.apache.oltu.oauth2.client.response.OAuthClientResponse
+import org.apache.oltu.oauth2.client.response.OAuthClientResponseFactory
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException
+import org.apache.oltu.oauth2.common.exception.OAuthSystemException
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.RequestBody
+
+
+class OAuthOkHttpClient(
+        private var client: OkHttpClient
+) : HttpClient {
+
+    constructor() : this(OkHttpClient())
+
+    @Throws(OAuthSystemException::class, OAuthProblemException::class)
+    override fun <T : OAuthClientResponse?> execute(
+            request: OAuthClientRequest, 
+            headers: Map<String, String>?,
+            requestMethod: String, 
+            responseClass: Class<T>?): T {
+
+        var mediaType = "application/json".toMediaTypeOrNull()
+        val requestBuilder = Request.Builder().url(request.locationUri)
+
+        headers?.forEach { entry ->
+            if (entry.key.equals("Content-Type", true)) {
+                mediaType = entry.value.toMediaTypeOrNull()
+            } else {
+                requestBuilder.addHeader(entry.key, entry.value)
+            }
+        }
+
+        val body: RequestBody? = if (request.body != null) RequestBody.create(mediaType, request.body) else null
+        requestBuilder.method(requestMethod, body)
+
+        try {
+            val response = client.newCall(requestBuilder.build()).execute()
+            return OAuthClientResponseFactory.createCustomResponse(
+                    response.body?.string(), 
+                    response.body?.contentType()?.toString(),
+                    response.code,
+                    responseClass)
+        } catch (e: IOException) {
+            throw OAuthSystemException(e)
+        }
+    }
+
+    override fun shutdown() {
+        // Nothing to do here
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..f19c5861dd70
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,200 @@
+package org.openapitools.client.infrastructure
+
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.AuthenticationRequestBuilder
+import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuilder
+import org.openapitools.client.auth.ApiKeyAuth
+import org.openapitools.client.auth.OAuth
+import org.openapitools.client.auth.OAuth.AccessTokenListener
+import org.openapitools.client.auth.OAuthFlow
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import com.squareup.moshi.Moshi
+import retrofit2.converter.moshi.MoshiConverterFactory
+
+class ApiClient(
+    private var baseUrl: String = defaultBasePath,
+    private val okHttpClientBuilder: OkHttpClient.Builder? = null,
+    private val serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+    private val okHttpClient : OkHttpClient? = null
+) {
+    private val apiAuthorizations = mutableMapOf<String, Interceptor>()
+    var logger: ((String) -> Unit)? = null
+
+    private val retrofitBuilder: Retrofit.Builder by lazy {
+        Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(MoshiConverterFactory.create(serializerBuilder.build()))
+    }
+
+    private val clientBuilder: OkHttpClient.Builder by lazy {
+        okHttpClientBuilder ?: defaultClientBuilder
+    }
+
+    private val defaultClientBuilder: OkHttpClient.Builder by lazy {
+        OkHttpClient()
+            .newBuilder()
+            .addInterceptor(HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
+                override fun log(message: String) {
+                    logger?.invoke(message)
+                }
+            }).apply {
+                level = HttpLoggingInterceptor.Level.BODY
+            })
+    }
+
+    init {
+        normalizeBaseUrl()
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authNames: Array<String>
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder) {
+        authNames.forEach { authName ->
+            val auth = when (authName) {
+                "api_key" -> ApiKeyAuth("header", "api_key")"petstore_auth" -> OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets")
+                else -> throw RuntimeException("auth name $authName not found in available auth names")
+            }
+            addAuthorization(authName, auth);
+        }
+    }
+
+    constructor(
+        baseUrl: String = defaultBasePath,
+        okHttpClientBuilder: OkHttpClient.Builder? = null,
+        serializerBuilder: Moshi.Builder = Serializer.moshiBuilder,
+        authName: String,
+        clientId: String,
+        secret: String,
+        username: String,
+        password: String
+    ) : this(baseUrl, okHttpClientBuilder, serializerBuilder, arrayOf(authName)) {
+        getTokenEndPoint()
+            ?.setClientId(clientId)
+            ?.setClientSecret(secret)
+            ?.setUsername(username)
+            ?.setPassword(password)
+    }
+
+    /**
+    * Helper method to configure the token endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Token request builder
+    */
+    fun getTokenEndPoint(): TokenRequestBuilder? {
+        var result: TokenRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = tokenRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to configure authorization endpoint of the first oauth found in the apiAuthorizations (there should be only one)
+    * @return Authentication request builder
+    */
+    fun getAuthorizationEndPoint(): AuthenticationRequestBuilder? {
+        var result: AuthenticationRequestBuilder? = null
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            result = authenticationRequestBuilder
+        }
+        return result
+    }
+
+    /**
+    * Helper method to pre-set the oauth access token of the first oauth found in the apiAuthorizations (there should be only one)
+    * @param accessToken Access token
+    * @return ApiClient
+    */
+    fun setAccessToken(accessToken: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            setAccessToken(accessToken)
+        }
+        return this
+    }
+
+    /**
+    * Helper method to configure the oauth accessCode/implicit flow parameters
+    * @param clientId Client ID
+    * @param clientSecret Client secret
+    * @param redirectURI Redirect URI
+    * @return ApiClient
+    */
+    fun configureAuthorizationFlow(clientId: String, clientSecret: String, redirectURI: String): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            tokenRequestBuilder
+                .setClientId(clientId)
+                .setClientSecret(clientSecret)
+                .setRedirectURI(redirectURI)
+            authenticationRequestBuilder
+                ?.setClientId(clientId)
+                ?.setRedirectURI(redirectURI)
+        }
+        return this;
+    }
+
+    /**
+    * Configures a listener which is notified when a new access token is received.
+    * @param accessTokenListener Access token listener
+    * @return ApiClient
+    */
+    fun registerAccessTokenListener(accessTokenListener: AccessTokenListener): ApiClient {
+        apiAuthorizations.values.runOnFirst<Interceptor, OAuth> {
+            registerAccessTokenListener(accessTokenListener)
+        }
+        return this;
+    }
+
+    /**
+     * Adds an authorization to be used by the client
+     * @param authName Authentication name
+     * @param authorization Authorization interceptor
+     * @return ApiClient
+     */
+    fun addAuthorization(authName: String, authorization: Interceptor): ApiClient {
+        if (apiAuthorizations.containsKey(authName)) {
+            throw RuntimeException("auth name $authName already in api authorizations")
+        }
+        apiAuthorizations[authName] = authorization
+        clientBuilder.addInterceptor(authorization)
+        return this
+    }
+
+    fun setLogger(logger: (String) -> Unit): ApiClient {
+        this.logger = logger
+        return this
+    }
+
+    fun <S> createService(serviceClass: Class<S>): S {
+        val usedClient = this.okHttpClient ?: clientBuilder.build()
+        return retrofitBuilder.client(usedClient).build().create(serviceClass)
+    }
+
+    private fun normalizeBaseUrl() {
+        if (!baseUrl.endsWith("/")) {
+            baseUrl += "/"
+        }
+    }
+
+    private inline fun <T, reified U> Iterable<T>.runOnFirst(callback: U.() -> Unit) {
+        for (element in this) {
+            if (element is U)  {
+                callback.invoke(element)
+                break
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt
new file mode 100644
index 000000000000..001e99325d2e
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/CollectionFormats.kt
@@ -0,0 +1,56 @@
+package org.openapitools.client.infrastructure
+
+class CollectionFormats {
+
+    open class CSVParams {
+
+        var params: List<String>
+
+        constructor(params: List<String>) {
+            this.params = params
+        }
+
+        constructor(vararg params: String) {
+            this.params = listOf(*params)
+        }
+
+        override fun toString(): String {
+            return params.joinToString(",")
+        }
+    }
+
+    open class SSVParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString(" ")
+        }
+    }
+
+    class TSVParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString("\t")
+        }
+    }
+
+    class PIPESParams : CSVParams {
+
+        constructor(params: List<String>) : super(params)
+
+        constructor(vararg params: String) : super(*params)
+
+        override fun toString(): String {
+            return params.joinToString("|")
+        }
+    }
+
+    class SPACEParams : SSVParams()
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt
new file mode 100644
index 000000000000..1804d1ae2bbd
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/ResponseExt.kt
@@ -0,0 +1,16 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.Moshi
+import retrofit2.Response
+
+@Throws(JsonDataException::class)
+inline fun <reified T> Response<*>.getErrorResponse(serializerBuilder: Moshi.Builder = Serializer.moshiBuilder): T? {
+    val serializer = serializerBuilder.build()
+    val parser = serializer.adapter(T::class.java)
+    val response = errorBody()?.string()
+    if(response != null) {
+        return parser.fromJson(response)
+    }
+    return null
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fafca8738f66
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..a4c17c3b49dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..a66c335904e7
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..a3df06cb6eb3
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..6e619023a5c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..af1e270325de
--- /dev/null
+++ b/samples/client/petstore/kotlin-retrofit2/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..4fbeccdbc00a
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param apiKey  (optional)
+    * @param petId Pet id to delete 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(apiKey: kotlin.String?, petId: kotlin.Long) : Unit {
+        val localVariableConfig = deletePetRequestConfig(apiKey = apiKey, petId = petId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param apiKey  (optional)
+    * @param petId Pet id to delete 
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(apiKey: kotlin.String?, petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..7a8dcc91cd4b
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..7d40c8efbc2f
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,38 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..ceb0fbc8fe60
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..ec768d1acefd
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,58 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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
+    }
+
+    /**
+    * Order Status
+    * Values: placed,approved,delivered
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..66667bf07cd1
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,60 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A pet for sale in the pet store
+ * @param id 
+ * @param category 
+ * @param name 
+ * @param photoUrls 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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
+    }
+
+    /**
+    * pet status in the store
+    * Values: available,pending,sold
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..944b1cd0a141
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..9697f07d5bf8
--- /dev/null
+++ b/samples/client/petstore/kotlin-string/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..135bcdc790e1
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..ff5439aeb42f
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import org.threeten.bp.LocalDate
+import org.threeten.bp.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..710a9cc13178
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..28b3eb3cd70a
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..fafca8738f66
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,32 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..a4c17c3b49dd
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..300f94d8545f
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..a3df06cb6eb3
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,56 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..6e619023a5c9
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,29 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..af1e270325de
--- /dev/null
+++ b/samples/client/petstore/kotlin-threetenbp/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,48 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/bin/main/org/openapitools/client/apis/EnumApi.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/apis/EnumApi.kt
new file mode 100644
index 000000000000..e504c876ce65
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/apis/EnumApi.kt
@@ -0,0 +1,89 @@
+/**
+* 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.PetEnum
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class EnumApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Get enums
+    * 
+    * @return PetEnum
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getEnum() : PetEnum {
+        val localVariableConfig = getEnumRequestConfig()
+
+        val localVarResponse = request<PetEnum>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as PetEnum
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getEnum
+    *
+    * @return RequestConfig
+    */
+    fun getEnumRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/enum",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..c34e9e42d08c
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,232 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/models/PetEnum.kt b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/models/PetEnum.kt
new file mode 100644
index 000000000000..a447bf920529
--- /dev/null
+++ b/samples/client/petstore/kotlin-uppercase-enum/bin/main/org/openapitools/client/models/PetEnum.kt
@@ -0,0 +1,43 @@
+/**
+* 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+
+/**
+* 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
+    }
+
+}
+
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/PetApi.kt
new file mode 100644
index 000000000000..c8b93b33bf6f
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/PetApi.kt
@@ -0,0 +1,492 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.ApiResponse
+import org.openapitools.client.models.Pet
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Add a new pet to the store
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun addPet(body: Pet) : Unit {
+        val localVariableConfig = addPetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation addPet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun addPetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Deletes a pet
+    * 
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deletePet(petId: kotlin.Long, apiKey: kotlin.String?) : Unit {
+        val localVariableConfig = deletePetRequestConfig(petId = petId, apiKey = apiKey)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deletePet
+    *
+    * @param petId Pet id to delete 
+    * @param apiKey  (optional)
+    * @return RequestConfig
+    */
+    fun deletePetRequestConfig(petId: kotlin.Long, apiKey: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        apiKey?.apply { localVariableHeaders["api_key"] = this.toString() }
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by status
+    * Multiple status values can be provided with comma separated strings
+    * @param status Status values that need to be considered for filter 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun findPetsByStatus(status: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByStatusRequestConfig(status = status)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByStatus
+    *
+    * @param status Status values that need to be considered for filter 
+    * @return RequestConfig
+    */
+    fun findPetsByStatusRequestConfig(status: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("status", toMultiValue(status.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByStatus",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Finds Pets by tags
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * @param tags Tags to filter by 
+    * @return kotlin.collections.List<Pet>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTags(tags: kotlin.collections.List<kotlin.String>) : kotlin.collections.List<Pet> {
+        val localVariableConfig = findPetsByTagsRequestConfig(tags = tags)
+
+        val localVarResponse = request<kotlin.collections.List<Pet>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.List<Pet>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation findPetsByTags
+    *
+    * @param tags Tags to filter by 
+    * @return RequestConfig
+    */
+    @Deprecated(message = "This operation is deprecated.")
+    fun findPetsByTagsRequestConfig(tags: kotlin.collections.List<kotlin.String>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("tags", toMultiValue(tags.toList(), "csv"))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/findByTags",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find pet by ID
+    * Returns a single pet
+    * @param petId ID of pet to return 
+    * @return Pet
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getPetById(petId: kotlin.Long) : Pet {
+        val localVariableConfig = getPetByIdRequestConfig(petId = petId)
+
+        val localVarResponse = request<Pet>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Pet
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getPetById
+    *
+    * @param petId ID of pet to return 
+    * @return RequestConfig
+    */
+    fun getPetByIdRequestConfig(petId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Update an existing pet
+    * 
+    * @param body Pet object that needs to be added to the store 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePet(body: Pet) : Unit {
+        val localVariableConfig = updatePetRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePet
+    *
+    * @param body Pet object that needs to be added to the store 
+    * @return RequestConfig
+    */
+    fun updatePetRequestConfig(body: Pet) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/pet",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updates a pet in the store with form data
+    * 
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updatePetWithForm(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : Unit {
+        val localVariableConfig = updatePetWithFormRequestConfig(petId = petId, name = name, status = status)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updatePetWithForm
+    *
+    * @param petId ID of pet that needs to be updated 
+    * @param name Updated name of the pet (optional)
+    * @param status Updated status of the pet (optional)
+    * @return RequestConfig
+    */
+    fun updatePetWithFormRequestConfig(petId: kotlin.Long, name: kotlin.String?, status: kotlin.String?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("name" to name, "status" to status)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "application/x-www-form-urlencoded")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * uploads an image
+    * 
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return ApiResponse
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun uploadFile(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : ApiResponse {
+        val localVariableConfig = uploadFileRequestConfig(petId = petId, additionalMetadata = additionalMetadata, file = file)
+
+        val localVarResponse = request<ApiResponse>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as ApiResponse
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation uploadFile
+    *
+    * @param petId ID of pet to update 
+    * @param additionalMetadata Additional data to pass to server (optional)
+    * @param file file to upload (optional)
+    * @return RequestConfig
+    */
+    fun uploadFileRequestConfig(petId: kotlin.Long, additionalMetadata: kotlin.String?, file: java.io.File?) : RequestConfig {
+        val localVariableBody: kotlin.Any? = mapOf("additionalMetadata" to additionalMetadata, "file" to file)
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf("Content-Type" to "multipart/form-data")
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/pet/{petId}/uploadImage".replace("{"+"petId"+"}", "$petId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/StoreApi.kt
new file mode 100644
index 000000000000..215ed63420c9
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/StoreApi.kt
@@ -0,0 +1,253 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.Order
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class StoreApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Delete purchase order by ID
+    * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+    * @param orderId ID of the order that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteOrder(orderId: kotlin.String) : Unit {
+        val localVariableConfig = deleteOrderRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteOrder
+    *
+    * @param orderId ID of the order that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteOrderRequestConfig(orderId: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Returns pet inventories by status
+    * Returns a map of status codes to quantities
+    * @return kotlin.collections.Map<kotlin.String, kotlin.Int>
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getInventory() : kotlin.collections.Map<kotlin.String, kotlin.Int> {
+        val localVariableConfig = getInventoryRequestConfig()
+
+        val localVarResponse = request<kotlin.collections.Map<kotlin.String, kotlin.Int>>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.collections.Map<kotlin.String, kotlin.Int>
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getInventory
+    *
+    * @return RequestConfig
+    */
+    fun getInventoryRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/inventory",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Find purchase order by ID
+    * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+    * @param orderId ID of pet that needs to be fetched 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getOrderById(orderId: kotlin.Long) : Order {
+        val localVariableConfig = getOrderByIdRequestConfig(orderId = orderId)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getOrderById
+    *
+    * @param orderId ID of pet that needs to be fetched 
+    * @return RequestConfig
+    */
+    fun getOrderByIdRequestConfig(orderId: kotlin.Long) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/store/order/{orderId}".replace("{"+"orderId"+"}", "$orderId"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Place an order for a pet
+    * 
+    * @param body order placed for purchasing the pet 
+    * @return Order
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun placeOrder(body: Order) : Order {
+        val localVariableConfig = placeOrderRequestConfig(body = body)
+
+        val localVarResponse = request<Order>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as Order
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation placeOrder
+    *
+    * @param body order placed for purchasing the pet 
+    * @return RequestConfig
+    */
+    fun placeOrderRequestConfig(body: Order) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/store/order",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/UserApi.kt
new file mode 100644
index 000000000000..53748b934636
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/apis/UserApi.kt
@@ -0,0 +1,476 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.apis
+
+import org.openapitools.client.models.User
+
+import org.openapitools.client.infrastructure.ApiClient
+import org.openapitools.client.infrastructure.ClientException
+import org.openapitools.client.infrastructure.ClientError
+import org.openapitools.client.infrastructure.ServerException
+import org.openapitools.client.infrastructure.ServerError
+import org.openapitools.client.infrastructure.MultiValueMap
+import org.openapitools.client.infrastructure.RequestConfig
+import org.openapitools.client.infrastructure.RequestMethod
+import org.openapitools.client.infrastructure.ResponseType
+import org.openapitools.client.infrastructure.Success
+import org.openapitools.client.infrastructure.toMultiValue
+
+class UserApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
+    companion object {
+        @JvmStatic
+        val defaultBasePath: String by lazy {
+            System.getProperties().getProperty("org.openapitools.client.baseUrl", "http://petstore.swagger.io/v2")
+        }
+    }
+
+    /**
+    * Create user
+    * This can only be done by the logged in user.
+    * @param body Created user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUser(body: User) : Unit {
+        val localVariableConfig = createUserRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUser
+    *
+    * @param body Created user object 
+    * @return RequestConfig
+    */
+    fun createUserRequestConfig(body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithArrayInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithArrayInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithArrayInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithArrayInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithArray",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Creates list of users with given input array
+    * 
+    * @param body List of user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun createUsersWithListInput(body: kotlin.collections.List<User>) : Unit {
+        val localVariableConfig = createUsersWithListInputRequestConfig(body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation createUsersWithListInput
+    *
+    * @param body List of user object 
+    * @return RequestConfig
+    */
+    fun createUsersWithListInputRequestConfig(body: kotlin.collections.List<User>) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.POST,
+            path = "/user/createWithList",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Delete user
+    * This can only be done by the logged in user.
+    * @param username The name that needs to be deleted 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun deleteUser(username: kotlin.String) : Unit {
+        val localVariableConfig = deleteUserRequestConfig(username = username)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation deleteUser
+    *
+    * @param username The name that needs to be deleted 
+    * @return RequestConfig
+    */
+    fun deleteUserRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.DELETE,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Get user by user name
+    * 
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return User
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun getUserByName(username: kotlin.String) : User {
+        val localVariableConfig = getUserByNameRequestConfig(username = username)
+
+        val localVarResponse = request<User>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as User
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation getUserByName
+    *
+    * @param username The name that needs to be fetched. Use user1 for testing. 
+    * @return RequestConfig
+    */
+    fun getUserByNameRequestConfig(username: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs user into the system
+    * 
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return kotlin.String
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Suppress("UNCHECKED_CAST")
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun loginUser(username: kotlin.String, password: kotlin.String) : kotlin.String {
+        val localVariableConfig = loginUserRequestConfig(username = username, password = password)
+
+        val localVarResponse = request<kotlin.String>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> (localVarResponse as Success<*>).data as kotlin.String
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation loginUser
+    *
+    * @param username The user name for login 
+    * @param password The password for login in clear text 
+    * @return RequestConfig
+    */
+    fun loginUserRequestConfig(username: kotlin.String, password: kotlin.String) : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
+            .apply {
+                put("username", listOf(username.toString()))
+                put("password", listOf(password.toString()))
+            }
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/login",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Logs out current logged in user session
+    * 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun logoutUser() : Unit {
+        val localVariableConfig = logoutUserRequestConfig()
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation logoutUser
+    *
+    * @return RequestConfig
+    */
+    fun logoutUserRequestConfig() : RequestConfig {
+        val localVariableBody: kotlin.Any? = null
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.GET,
+            path = "/user/logout",
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+    /**
+    * Updated user
+    * This can only be done by the logged in user.
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return void
+    * @throws UnsupportedOperationException If the API returns an informational or redirection response
+    * @throws ClientException If the API returns a client error response
+    * @throws ServerException If the API returns a server error response
+    */
+    @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    fun updateUser(username: kotlin.String, body: User) : Unit {
+        val localVariableConfig = updateUserRequestConfig(username = username, body = body)
+
+        val localVarResponse = request<Any?>(
+            localVariableConfig
+        )
+
+        return when (localVarResponse.responseType) {
+            ResponseType.Success -> Unit
+            ResponseType.Informational -> throw UnsupportedOperationException("Client does not support Informational responses.")
+            ResponseType.Redirection -> throw UnsupportedOperationException("Client does not support Redirection responses.")
+            ResponseType.ClientError -> {
+                val localVarError = localVarResponse as ClientError<*>
+                throw ClientException("Client error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+            ResponseType.ServerError -> {
+                val localVarError = localVarResponse as ServerError<*>
+                throw ServerException("Server error : ${localVarError.statusCode} ${localVarError.message.orEmpty()}", localVarError.statusCode, localVarResponse)
+            }
+        }
+    }
+
+    /**
+    * To obtain the request config of the operation updateUser
+    *
+    * @param username name that need to be deleted 
+    * @param body Updated user object 
+    * @return RequestConfig
+    */
+    fun updateUserRequestConfig(username: kotlin.String, body: User) : RequestConfig {
+        val localVariableBody: kotlin.Any? = body
+        val localVariableQuery: MultiValueMap = mutableMapOf()
+        val localVariableHeaders: MutableMap<String, String> = mutableMapOf()
+        
+        val localVariableConfig = RequestConfig(
+            method = RequestMethod.PUT,
+            path = "/user/{username}".replace("{"+"username"+"}", "$username"),
+            query = localVariableQuery,
+            headers = localVariableHeaders,
+            body = localVariableBody
+        )
+
+        return localVariableConfig
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
new file mode 100644
index 000000000000..ef7a8f1e1a62
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiAbstractions.kt
@@ -0,0 +1,23 @@
+package org.openapitools.client.infrastructure
+
+typealias MultiValueMap = MutableMap<String,List<String>>
+
+fun collectionDelimiter(collectionFormat: String) = when(collectionFormat) {
+    "csv" -> ","
+    "tsv" -> "\t"
+    "pipe" -> "|"
+    "space" -> " "
+    else -> ""
+}
+
+val defaultMultiValueConverter: (item: Any?) -> String = { item -> "$item" }
+
+fun <T : Any?> toMultiValue(items: Array<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter)
+        = toMultiValue(items.asIterable(), collectionFormat, map)
+
+fun <T : Any?> toMultiValue(items: Iterable<T>, collectionFormat: String, map: (item: T) -> String = defaultMultiValueConverter): List<String> {
+    return when(collectionFormat) {
+        "multi" -> items.map(map)
+        else -> listOf(items.joinToString(separator = collectionDelimiter(collectionFormat), transform = map))
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiClient.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
new file mode 100644
index 000000000000..7a8dcc91cd4b
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiClient.kt
@@ -0,0 +1,251 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Credentials
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.RequestBody.Companion.asRequestBody
+import okhttp3.RequestBody.Companion.toRequestBody
+import okhttp3.FormBody
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
+import okhttp3.Request
+import okhttp3.Headers
+import okhttp3.MultipartBody
+import java.io.File
+import java.net.URLConnection
+import java.util.Date
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.OffsetDateTime
+import java.time.OffsetTime
+
+open class ApiClient(val baseUrl: String) {
+    companion object {
+        protected const val ContentType = "Content-Type"
+        protected const val Accept = "Accept"
+        protected const val Authorization = "Authorization"
+        protected const val JsonMediaType = "application/json"
+        protected const val FormDataMediaType = "multipart/form-data"
+        protected const val FormUrlEncMediaType = "application/x-www-form-urlencoded"
+        protected const val XmlMediaType = "application/xml"
+
+        val apiKey: MutableMap<String, String> = mutableMapOf()
+        val apiKeyPrefix: MutableMap<String, String> = mutableMapOf()
+        var username: String? = null
+        var password: String? = null
+        var accessToken: String? = null
+
+        @JvmStatic
+        val client: OkHttpClient by lazy {
+            builder.build()
+        }
+
+        @JvmStatic
+        val builder: OkHttpClient.Builder = OkHttpClient.Builder()
+    }
+
+    /**
+     * Guess Content-Type header from the given file (defaults to "application/octet-stream").
+     *
+     * @param file The given file
+     * @return The guessed Content-Type
+     */
+    protected fun guessContentTypeFromFile(file: File): String {
+        val contentType = URLConnection.guessContentTypeFromName(file.name)
+        return contentType ?: "application/octet-stream"
+    }
+
+    protected inline fun <reified T> requestBody(content: T, mediaType: String = JsonMediaType): RequestBody =
+        when {
+            content is File -> content.asRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == FormDataMediaType -> {
+                MultipartBody.Builder()
+                    .setType(MultipartBody.FORM)
+                    .apply {
+                        // content's type *must* be Map<String, Any?>
+                        @Suppress("UNCHECKED_CAST")
+                        (content as Map<String, Any?>).forEach { (key, value) ->
+                            if (value is File) {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\"; filename=\"${value.name}\""
+                                )
+                                val fileMediaType = guessContentTypeFromFile(value).toMediaTypeOrNull()
+                                addPart(partHeaders, value.asRequestBody(fileMediaType))
+                            } else {
+                                val partHeaders = Headers.headersOf(
+                                    "Content-Disposition",
+                                    "form-data; name=\"$key\""
+                                )
+                                addPart(
+                                    partHeaders,
+                                    parameterToString(value).toRequestBody(null)
+                                )
+                            }
+                        }
+                    }.build()
+            }
+            mediaType == FormUrlEncMediaType -> {
+                FormBody.Builder().apply {
+                    // content's type *must* be Map<String, Any?>
+                    @Suppress("UNCHECKED_CAST")
+                    (content as Map<String, Any?>).forEach { (key, value) ->
+                        add(key, parameterToString(value))
+                    }
+                }.build()
+            }
+            mediaType == JsonMediaType -> Serializer.moshi.adapter(T::class.java).toJson(content).toRequestBody(
+                mediaType.toMediaTypeOrNull()
+            )
+            mediaType == XmlMediaType -> throw UnsupportedOperationException("xml not currently supported.")
+            // TODO: this should be extended with other serializers
+            else -> throw UnsupportedOperationException("requestBody currently only supports JSON body and File body.")
+        }
+
+    protected inline fun <reified T: Any?> responseBody(body: ResponseBody?, mediaType: String? = JsonMediaType): T? {
+        if(body == null) {
+            return null
+        }
+        val bodyContent = body.string()
+        if (bodyContent.isEmpty()) {
+            return null
+        }
+        return when(mediaType) {
+            JsonMediaType -> Serializer.moshi.adapter(T::class.java).fromJson(bodyContent)
+            else ->  throw UnsupportedOperationException("responseBody currently only supports JSON body.")
+        }
+    }
+
+    protected fun updateAuthParams(requestConfig: RequestConfig) {
+        if (requestConfig.headers["api_key"].isNullOrEmpty()) {
+            if (apiKey["api_key"] != null) {
+                if (apiKeyPrefix["api_key"] != null) {
+                    requestConfig.headers["api_key"] = apiKeyPrefix["api_key"]!! + " " + apiKey["api_key"]!!
+                } else {
+                    requestConfig.headers["api_key"] = apiKey["api_key"]!!
+                }
+            }
+        }
+        if (requestConfig.headers[Authorization].isNullOrEmpty()) {
+            accessToken?.let { accessToken ->
+                requestConfig.headers[Authorization] = "Bearer $accessToken "
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any?> request(requestConfig: RequestConfig): ApiInfrastructureResponse<T?> {
+        val httpUrl = baseUrl.toHttpUrlOrNull() ?: throw IllegalStateException("baseUrl is invalid.")
+
+        // take authMethod from operation
+        updateAuthParams(requestConfig)
+
+        val url = httpUrl.newBuilder()
+            .addPathSegments(requestConfig.path.trimStart('/'))
+            .apply {
+                requestConfig.query.forEach { query ->
+                    query.value.forEach { queryValue ->
+                        addQueryParameter(query.key, queryValue)
+                    }
+                }
+            }.build()
+
+        // take content-type/accept from spec or set to default (application/json) if not defined
+        if (requestConfig.headers[ContentType].isNullOrEmpty()) {
+            requestConfig.headers[ContentType] = JsonMediaType
+        }
+        if (requestConfig.headers[Accept].isNullOrEmpty()) {
+            requestConfig.headers[Accept] = JsonMediaType
+        }
+        val headers = requestConfig.headers
+
+        if(headers[ContentType] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Content-Type header. This is required.")
+        }
+
+        if(headers[Accept] ?: "" == "") {
+            throw kotlin.IllegalStateException("Missing Accept header. This is required.")
+        }
+
+        // TODO: support multiple contentType options here.
+        val contentType = (headers[ContentType] as String).substringBefore(";").toLowerCase()
+
+        val request = when (requestConfig.method) {
+            RequestMethod.DELETE -> Request.Builder().url(url).delete(requestBody(requestConfig.body, contentType))
+            RequestMethod.GET -> Request.Builder().url(url)
+            RequestMethod.HEAD -> Request.Builder().url(url).head()
+            RequestMethod.PATCH -> Request.Builder().url(url).patch(requestBody(requestConfig.body, contentType))
+            RequestMethod.PUT -> Request.Builder().url(url).put(requestBody(requestConfig.body, contentType))
+            RequestMethod.POST -> Request.Builder().url(url).post(requestBody(requestConfig.body, contentType))
+            RequestMethod.OPTIONS -> Request.Builder().url(url).method("OPTIONS", null)
+        }.apply {
+            headers.forEach { header -> addHeader(header.key, header.value) }
+        }.build()
+
+        val response = client.newCall(request).execute()
+        val accept = response.header(ContentType)?.substringBefore(";")?.toLowerCase()
+
+        // TODO: handle specific mapping types. e.g. Map<int, Class<?>>
+        when {
+            response.isRedirect -> return Redirection(
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isInformational -> return Informational(
+                    response.message,
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isSuccessful -> return Success(
+                    responseBody(response.body, accept),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            response.isClientError -> return ClientError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+            else -> return ServerError(
+                    response.message,
+                    response.body?.string(),
+                    response.code,
+                    response.headers.toMultimap()
+            )
+        }
+    }
+
+    protected fun parameterToString(value: Any?): String {
+        when (value) {
+            null -> {
+                return ""
+            }
+            is Array<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is Iterable<*> -> {
+                return toMultiValue(value, "csv").toString()
+            }
+            is OffsetDateTime, is OffsetTime, is LocalDateTime, is LocalDate, is LocalTime, is Date -> {
+                return parseDateToQueryString<Any>(value)
+            }
+            else -> {
+                return value.toString()
+            }
+        }
+    }
+
+    protected inline fun <reified T: Any> parseDateToQueryString(value : T): String {
+        /*
+        .replace("\"", "") converts the json object string to an actual string for the query parameter.
+        The moshi or gson adapter allows a more generic solution instead of trying to use a native
+        formatter. It also easily allows to provide a simple way to define a custom date format pattern
+        inside a gson/moshi adapter.
+        */
+        return Serializer.moshi.adapter(T::class.java).toJson(value).replace("\"", "")
+    }
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
new file mode 100644
index 000000000000..9dc8d8dbbfaa
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
@@ -0,0 +1,43 @@
+package org.openapitools.client.infrastructure
+
+enum class ResponseType {
+    Success, Informational, Redirection, ClientError, ServerError
+}
+
+interface Response
+
+abstract class ApiInfrastructureResponse<T>(val responseType: ResponseType): Response {
+    abstract val statusCode: Int
+    abstract val headers: Map<String,List<String>>
+}
+
+class Success<T>(
+    val data: T,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+): ApiInfrastructureResponse<T>(ResponseType.Success)
+
+class Informational<T>(
+    val statusText: String,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Informational)
+
+class Redirection<T>(
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.Redirection)
+
+class ClientError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>> = mapOf()
+) : ApiInfrastructureResponse<T>(ResponseType.ClientError)
+
+class ServerError<T>(
+    val message: String? = null,
+    val body: Any? = null,
+    override val statusCode: Int = -1,
+    override val headers: Map<String, List<String>>
+): ApiInfrastructureResponse<T>(ResponseType.ServerError)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
new file mode 100644
index 000000000000..dd34bd48b2c0
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ApplicationDelegates.kt
@@ -0,0 +1,29 @@
+package org.openapitools.client.infrastructure
+
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+object ApplicationDelegates {
+    /**
+     * Provides a property delegate, allowing the property to be set once and only once.
+     *
+     * If unset (no default value), a get on the property will throw [IllegalStateException].
+     */
+    fun <T> setOnce(defaultValue: T? = null) : ReadWriteProperty<Any?, T> = SetOnce(defaultValue)
+
+    private class SetOnce<T>(defaultValue: T? = null) : ReadWriteProperty<Any?, T> {
+        private var isSet = false
+        private var value: T? = defaultValue
+
+        override fun getValue(thisRef: Any?, property: KProperty<*>): T {
+            return value ?: throw IllegalStateException("${property.name} not initialized")
+        }
+
+        override fun setValue(thisRef: Any?, property: KProperty<*>, value: T) = synchronized(this) {
+            if (!isSet) {
+                this.value = value
+                isSet = true
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
new file mode 100644
index 000000000000..ff5e2a81ee8c
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
@@ -0,0 +1,12 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+
+class ByteArrayAdapter {
+    @ToJson
+    fun toJson(data: ByteArray): String = String(data)
+
+    @FromJson
+    fun fromJson(data: String): ByteArray = data.toByteArray()
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Errors.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Errors.kt
new file mode 100644
index 000000000000..b5310e71f13c
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Errors.kt
@@ -0,0 +1,18 @@
+@file:Suppress("unused")
+package org.openapitools.client.infrastructure
+
+import java.lang.RuntimeException
+
+open class ClientException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 123L
+    }
+}
+
+open class ServerException(message: kotlin.String? = null, val statusCode: Int = -1, val response: Response? = null) : RuntimeException(message) {
+
+    companion object {
+        private const val serialVersionUID: Long = 456L
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
new file mode 100644
index 000000000000..b2e1654479a0
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+class LocalDateAdapter {
+    @ToJson
+    fun toJson(value: LocalDate): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDate {
+        return LocalDate.parse(value, DateTimeFormatter.ISO_LOCAL_DATE)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
new file mode 100644
index 000000000000..e082db94811d
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+
+class LocalDateTimeAdapter {
+    @ToJson
+    fun toJson(value: LocalDateTime): String {
+        return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): LocalDateTime {
+        return LocalDateTime.parse(value, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
new file mode 100644
index 000000000000..87437871a31e
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
@@ -0,0 +1,19 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.time.OffsetDateTime
+import java.time.format.DateTimeFormatter
+
+class OffsetDateTimeAdapter {
+    @ToJson
+    fun toJson(value: OffsetDateTime): String {
+        return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(value)
+    }
+
+    @FromJson
+    fun fromJson(value: String): OffsetDateTime {
+        return OffsetDateTime.parse(value, DateTimeFormatter.ISO_OFFSET_DATE_TIME)
+    }
+
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
new file mode 100644
index 000000000000..0f2790f370e2
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestConfig.kt
@@ -0,0 +1,17 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Defines a config object for a given request.
+ * NOTE: This object doesn't include 'body' because it
+ *       allows for caching of the constructed object
+ *       for many request definitions.
+ * NOTE: Headers is a Map<String,String> because rfc2616 defines
+ *       multi-valued headers as csv-only.
+ */
+data class RequestConfig(
+    val method: RequestMethod,
+    val path: String,
+    val headers: MutableMap<String, String> = mutableMapOf(),
+    val query: MutableMap<String, List<String>> = mutableMapOf(),
+    val body: kotlin.Any? = null
+)
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
new file mode 100644
index 000000000000..931b12b8bd7a
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/RequestMethod.kt
@@ -0,0 +1,8 @@
+package org.openapitools.client.infrastructure
+
+/**
+ * Provides enumerated HTTP verbs
+ */
+enum class RequestMethod {
+    GET, DELETE, HEAD, OPTIONS, PATCH, POST, PUT
+}
\ No newline at end of file
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
new file mode 100644
index 000000000000..9bd2790dc144
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/ResponseExtensions.kt
@@ -0,0 +1,24 @@
+package org.openapitools.client.infrastructure
+
+import okhttp3.Response
+
+/**
+ * Provides an extension to evaluation whether the response is a 1xx code
+ */
+val Response.isInformational : Boolean get() = this.code in 100..199
+
+/**
+ * Provides an extension to evaluation whether the response is a 3xx code
+ */
+@Suppress("EXTENSION_SHADOWED_BY_MEMBER")
+val Response.isRedirect : Boolean get() = this.code in 300..399
+
+/**
+ * Provides an extension to evaluation whether the response is a 4xx code
+ */
+val Response.isClientError : Boolean get() = this.code in 400..499
+
+/**
+ * Provides an extension to evaluation whether the response is a 5xx (Standard) through 999 (non-standard) code
+ */
+val Response.isServerError : Boolean get() = this.code in 500..999
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Serializer.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Serializer.kt
new file mode 100644
index 000000000000..9a45b67d9b1a
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/Serializer.kt
@@ -0,0 +1,21 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
+import java.util.Date
+
+object Serializer {
+    @JvmStatic
+    val moshiBuilder: Moshi.Builder = Moshi.Builder()
+        .add(OffsetDateTimeAdapter())
+        .add(LocalDateTimeAdapter())
+        .add(LocalDateAdapter())
+        .add(UUIDAdapter())
+        .add(ByteArrayAdapter())
+        .add(KotlinJsonAdapterFactory())
+
+    @JvmStatic
+    val moshi: Moshi by lazy {
+        moshiBuilder.build()
+    }
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
new file mode 100644
index 000000000000..a4a44cc18b73
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/infrastructure/UUIDAdapter.kt
@@ -0,0 +1,13 @@
+package org.openapitools.client.infrastructure
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import java.util.UUID
+
+class UUIDAdapter {
+    @ToJson
+    fun toJson(uuid: UUID) = uuid.toString()
+
+    @FromJson
+    fun fromJson(s: String) = UUID.fromString(s)
+}
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/ApiResponse.kt
new file mode 100644
index 000000000000..7d40c8efbc2f
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/ApiResponse.kt
@@ -0,0 +1,38 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Category.kt
new file mode 100644
index 000000000000..ceb0fbc8fe60
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Category.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Order.kt
new file mode 100644
index 000000000000..ed8f8b13a43b
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Order.kt
@@ -0,0 +1,58 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * An order for a pets from the pet store
+ * @param id 
+ * @param petId 
+ * @param quantity 
+ * @param shipDate 
+ * @param status Order Status
+ * @param complete 
+ */
+
+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
+    }
+
+    /**
+    * Order Status
+    * Values: placed,approved,delivered
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "placed") placed("placed"),
+        @Json(name = "approved") approved("approved"),
+        @Json(name = "delivered") delivered("delivered");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Pet.kt
new file mode 100644
index 000000000000..105f485f021d
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Pet.kt
@@ -0,0 +1,60 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+import org.openapitools.client.models.Category
+import org.openapitools.client.models.Tag
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A pet for sale in the pet store
+ * @param name 
+ * @param photoUrls 
+ * @param id 
+ * @param category 
+ * @param tags 
+ * @param status pet status in the store
+ */
+
+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
+    }
+
+    /**
+    * pet status in the store
+    * Values: available,pending,sold
+    */
+    
+    enum class Status(val value: kotlin.String){
+        @Json(name = "available") available("available"),
+        @Json(name = "pending") pending("pending"),
+        @Json(name = "sold") sold("sold");
+    }
+}
+
diff --git a/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Tag.kt
new file mode 100644
index 000000000000..944b1cd0a141
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/Tag.kt
@@ -0,0 +1,35 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+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/bin/main/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/User.kt
new file mode 100644
index 000000000000..9697f07d5bf8
--- /dev/null
+++ b/samples/client/petstore/kotlin/bin/main/org/openapitools/client/models/User.kt
@@ -0,0 +1,54 @@
+/**
+* OpenAPI Petstore
+* This is a sample server Petstore server. For 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.
+*/
+package org.openapitools.client.models
+
+
+import com.squareup.moshi.Json
+import java.io.Serializable
+
+/**
+ * A User who is purchasing from the pet store
+ * @param id 
+ * @param username 
+ * @param firstName 
+ * @param lastName 
+ * @param email 
+ * @param password 
+ * @param phone 
+ * @param userStatus User Status
+ */
+
+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/perl/.openapi-generator/FILES b/samples/client/petstore/perl/.openapi-generator/FILES
index bcb69b109567..89797e58562a 100644
--- a/samples/client/petstore/perl/.openapi-generator/FILES
+++ b/samples/client/petstore/perl/.openapi-generator/FILES
@@ -44,6 +44,7 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
@@ -98,6 +99,7 @@ lib/WWW/OpenAPIClient/Object/OuterEnum.pm
 lib/WWW/OpenAPIClient/Object/OuterEnumDefaultValue.pm
 lib/WWW/OpenAPIClient/Object/OuterEnumInteger.pm
 lib/WWW/OpenAPIClient/Object/OuterEnumIntegerDefaultValue.pm
+lib/WWW/OpenAPIClient/Object/OuterObjectWithEnumProperty.pm
 lib/WWW/OpenAPIClient/Object/Pet.pm
 lib/WWW/OpenAPIClient/Object/ReadOnlyFirst.pm
 lib/WWW/OpenAPIClient/Object/SpecialModelName.pm
diff --git a/samples/client/petstore/perl/README.md b/samples/client/petstore/perl/README.md
index 69d1869c143d..9dd81b461b1c 100644
--- a/samples/client/petstore/perl/README.md
+++ b/samples/client/petstore/perl/README.md
@@ -217,6 +217,15 @@ spec. If so, this is available via the `class_documentation()` and
 
 Each of these calls returns a hashref with various useful pieces of information.
 
+# Installation Prerequisites
+
+Use [cpanm](https://metacpan.org/pod/distribution/App-cpanminus/bin/cpanm) to install the module dependencies:
+
+```
+cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
+cpanm --quiet --no-interactive Class::Accessor Test::Exception Test::More Log::Any LWP::UserAgent URI::Query Module::Runtime DateTime Module::Find Moose::Role JSON
+```
+
 # LOAD THE MODULES
 
 To load the API packages:
@@ -271,6 +280,7 @@ use WWW::OpenAPIClient::Object::OuterEnum;
 use WWW::OpenAPIClient::Object::OuterEnumDefaultValue;
 use WWW::OpenAPIClient::Object::OuterEnumInteger;
 use WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue;
+use WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty;
 use WWW::OpenAPIClient::Object::Pet;
 use WWW::OpenAPIClient::Object::ReadOnlyFirst;
 use WWW::OpenAPIClient::Object::SpecialModelName;
@@ -334,6 +344,7 @@ use WWW::OpenAPIClient::Object::OuterEnum;
 use WWW::OpenAPIClient::Object::OuterEnumDefaultValue;
 use WWW::OpenAPIClient::Object::OuterEnumInteger;
 use WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue;
+use WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty;
 use WWW::OpenAPIClient::Object::Pet;
 use WWW::OpenAPIClient::Object::ReadOnlyFirst;
 use WWW::OpenAPIClient::Object::SpecialModelName;
@@ -342,9 +353,9 @@ use WWW::OpenAPIClient::Object::User;
 
 # for displaying the API response data
 use Data::Dumper;
-use WWW::OpenAPIClient::;
 
-my $api_instance = WWW::OpenAPIClient::->new(
+
+my $api_instance = WWW::OpenAPIClient::AnotherFakeApi->new(
 );
 
 my $client = WWW::OpenAPIClient::Object::Client->new(); # Client | client model
@@ -373,6 +384,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**fake_property_enum_integer_serialize**](docs/FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**test_body_with_file_schema**](docs/FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -445,6 +457,7 @@ Class | Method | HTTP request | Description
  - [WWW::OpenAPIClient::Object::OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [WWW::OpenAPIClient::Object::OuterEnumInteger](docs/OuterEnumInteger.md)
  - [WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [WWW::OpenAPIClient::Object::Pet](docs/Pet.md)
  - [WWW::OpenAPIClient::Object::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [WWW::OpenAPIClient::Object::SpecialModelName](docs/SpecialModelName.md)
diff --git a/samples/client/petstore/perl/docs/FakeApi.md b/samples/client/petstore/perl/docs/FakeApi.md
index be76016b63ec..d1696217c594 100644
--- a/samples/client/petstore/perl/docs/FakeApi.md
+++ b/samples/client/petstore/perl/docs/FakeApi.md
@@ -15,6 +15,7 @@ Method | HTTP request | Description
 [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+[**fake_property_enum_integer_serialize**](FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 [**test_body_with_file_schema**](FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 [**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 [**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -300,6 +301,52 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **fake_property_enum_integer_serialize**
+> OuterObjectWithEnumProperty fake_property_enum_integer_serialize(outer_object_with_enum_property => $outer_object_with_enum_property)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example 
+```perl
+use Data::Dumper;
+use WWW::OpenAPIClient::FakeApi;
+my $api_instance = WWW::OpenAPIClient::FakeApi->new(
+);
+
+my $outer_object_with_enum_property = WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty->new(); # OuterObjectWithEnumProperty | Input enum (int) as post body
+
+eval { 
+    my $result = $api_instance->fake_property_enum_integer_serialize(outer_object_with_enum_property => $outer_object_with_enum_property);
+    print Dumper($result);
+};
+if ($@) {
+    warn "Exception when calling FakeApi->fake_property_enum_integer_serialize: $@\n";
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outer_object_with_enum_property** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: */*
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **test_body_with_file_schema**
 > test_body_with_file_schema(file_schema_test_class => $file_schema_test_class)
 
diff --git a/samples/client/petstore/perl/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/perl/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..93885100ebb6
--- /dev/null
+++ b/samples/client/petstore/perl/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,15 @@
+# WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty
+
+## Load the model package
+```perl
+use WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty;
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm
index 4debb5412ca3..8646aa3cc078 100644
--- a/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm
+++ b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/FakeApi.pm
@@ -420,6 +420,71 @@ sub fake_outer_string_serialize {
     return $_response_object;
 }
 
+#
+# fake_property_enum_integer_serialize
+#
+# 
+# 
+# @param OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+{
+    my $params = {
+    'outer_object_with_enum_property' => {
+        data_type => 'OuterObjectWithEnumProperty',
+        description => 'Input enum (int) as post body',
+        required => '1',
+    },
+    };
+    __PACKAGE__->method_documentation->{ 'fake_property_enum_integer_serialize' } = { 
+        summary => '',
+        params => $params,
+        returns => 'OuterObjectWithEnumProperty',
+        };
+}
+# @return OuterObjectWithEnumProperty
+#
+sub fake_property_enum_integer_serialize {
+    my ($self, %args) = @_;
+
+    # verify the required parameter 'outer_object_with_enum_property' is set
+    unless (exists $args{'outer_object_with_enum_property'}) {
+      croak("Missing the required parameter 'outer_object_with_enum_property' when calling fake_property_enum_integer_serialize");
+    }
+
+    # parse inputs
+    my $_resource_path = '/fake/property/enum-int';
+
+    my $_method = 'POST';
+    my $query_params = {};
+    my $header_params = {};
+    my $form_params = {};
+
+    # 'Accept' and 'Content-Type' header
+    my $_header_accept = $self->{api_client}->select_header_accept('*/*');
+    if ($_header_accept) {
+        $header_params->{'Accept'} = $_header_accept;
+    }
+    $header_params->{'Content-Type'} = $self->{api_client}->select_header_content_type('application/json');
+
+    my $_body_data;
+    # body params
+    if ( exists $args{'outer_object_with_enum_property'}) {
+        $_body_data = $args{'outer_object_with_enum_property'};
+    }
+
+    # authentication setting, if any
+    my $auth_settings = [qw()];
+
+    # make the API Call
+    my $response = $self->{api_client}->call_api($_resource_path, $_method,
+                                           $query_params, $form_params,
+                                           $header_params, $_body_data, $auth_settings);
+    if (!$response) {
+        return;
+    }
+    my $_response_object = $self->{api_client}->deserialize('OuterObjectWithEnumProperty', $response);
+    return $_response_object;
+}
+
 #
 # test_body_with_file_schema
 #
diff --git a/samples/client/petstore/perl/lib/WWW/OpenAPIClient/Object/OuterObjectWithEnumProperty.pm b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/Object/OuterObjectWithEnumProperty.pm
new file mode 100644
index 000000000000..39644d24d5c2
--- /dev/null
+++ b/samples/client/petstore/perl/lib/WWW/OpenAPIClient/Object/OuterObjectWithEnumProperty.pm
@@ -0,0 +1,185 @@
+=begin comment
+
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+# Do not edit the class manually.
+# Ref: https://openapi-generator.tech
+#
+package WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty;
+
+require 5.6.0;
+use strict;
+use warnings;
+use utf8;
+use JSON qw(decode_json);
+use Data::Dumper;
+use Module::Runtime qw(use_module);
+use Log::Any qw($log);
+use Date::Parse;
+use DateTime;
+
+use WWW::OpenAPIClient::Object::OuterEnumInteger;
+
+use base ("Class::Accessor", "Class::Data::Inheritable");
+
+#
+#
+#
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). Do not edit the class manually.
+# REF: https://openapi-generator.tech
+#
+
+=begin comment
+
+OpenAPI Petstore
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+
+=end comment
+
+=cut
+
+#
+# NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+# Do not edit the class manually.
+# Ref: https://openapi-generator.tech
+#
+__PACKAGE__->mk_classdata('attribute_map' => {});
+__PACKAGE__->mk_classdata('openapi_types' => {});
+__PACKAGE__->mk_classdata('method_documentation' => {}); 
+__PACKAGE__->mk_classdata('class_documentation' => {});
+
+# new plain object
+sub new { 
+    my ($class, %args) = @_; 
+
+    my $self = bless {}, $class;
+
+    $self->init(%args);
+    
+    return $self;
+}
+
+# initialize the object
+sub init
+{
+    my ($self, %args) = @_;
+
+    foreach my $attribute (keys %{$self->attribute_map}) {
+        my $args_key = $self->attribute_map->{$attribute};
+        $self->$attribute( $args{ $args_key } );
+    }
+}
+
+# return perl hash
+sub to_hash {
+    my $self = shift;
+    my $_hash = decode_json(JSON->new->convert_blessed->encode($self));
+
+    return $_hash;
+}
+
+# used by JSON for serialization
+sub TO_JSON { 
+    my $self = shift;
+    my $_data = {};
+    foreach my $_key (keys %{$self->attribute_map}) {
+        if (defined $self->{$_key}) {
+            $_data->{$self->attribute_map->{$_key}} = $self->{$_key};
+        }
+    }
+
+    return $_data;
+}
+
+# from Perl hashref
+sub from_hash {
+    my ($self, $hash) = @_;
+
+    # loop through attributes and use openapi_types to deserialize the data
+    while ( my ($_key, $_type) = each %{$self->openapi_types} ) {
+        my $_json_attribute = $self->attribute_map->{$_key}; 
+        if ($_type =~ /^array\[(.+)\]$/i) { # array
+            my $_subclass = $1;
+            my @_array = ();
+            foreach my $_element (@{$hash->{$_json_attribute}}) {
+                push @_array, $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \@_array;
+        } elsif ($_type =~ /^hash\[string,(.+)\]$/i) { # hash
+            my $_subclass = $1;
+            my %_hash = ();
+            while (my($_key, $_element) = each %{$hash->{$_json_attribute}}) {
+                $_hash{$_key} = $self->_deserialize($_subclass, $_element);
+            }
+            $self->{$_key} = \%_hash;
+        } elsif (exists $hash->{$_json_attribute}) { #hash(model), primitive, datetime
+            $self->{$_key} = $self->_deserialize($_type, $hash->{$_json_attribute});
+        } else {
+            $log->debugf("Warning: %s (%s) does not exist in input hash\n", $_key, $_json_attribute);
+        }
+    }
+  
+    return $self;
+}
+
+# deserialize non-array data
+sub _deserialize {
+    my ($self, $type, $data) = @_;
+    $log->debugf("deserializing %s with %s",Dumper($data), $type);
+
+    if ($type eq 'DateTime') {
+        return DateTime->from_epoch(epoch => str2time($data));
+    } elsif ( grep( /^$type$/, ('int', 'double', 'string', 'boolean'))) {
+        return $data;
+    } else { # hash(model)
+        my $_instance = eval "WWW::OpenAPIClient::Object::$type->new()";
+        return $_instance->from_hash($data);
+    }
+}
+
+
+
+__PACKAGE__->class_documentation({description => '',
+                                  class => 'OuterObjectWithEnumProperty',
+                                  required => [], # TODO
+}                                 );
+
+__PACKAGE__->method_documentation({
+    'value' => {
+        datatype => 'OuterEnumInteger',
+        base_name => 'value',
+        description => '',
+        format => '',
+        read_only => '',
+            },
+});
+
+__PACKAGE__->openapi_types( {
+    'value' => 'OuterEnumInteger'
+} );
+
+__PACKAGE__->attribute_map( {
+    'value' => 'value'
+} );
+
+__PACKAGE__->mk_accessors(keys %{__PACKAGE__->attribute_map});
+
+
+1;
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesAnyTypeTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesAnyTypeTest.t
deleted file mode 100644
index fd0e0a47e66c..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesAnyTypeTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesAnyType');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesAnyType->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesAnyType');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesArrayTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesArrayTest.t
deleted file mode 100644
index 406f44bf6afc..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesArrayTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesArray');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesArray->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesArray');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesBooleanTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesBooleanTest.t
deleted file mode 100644
index 4bd9f751cbc0..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesBooleanTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesBoolean');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesBoolean->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesBoolean');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t
index 911346271485..50c86cef1d36 100644
--- a/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t
+++ b/samples/client/petstore/perl/t/AdditionalPropertiesClassTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesClass');
 
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesClass->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesClass');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesClass->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesClass');
 
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesIntegerTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesIntegerTest.t
deleted file mode 100644
index 3b577613f8dc..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesIntegerTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesInteger');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesInteger->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesInteger');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesNumberTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesNumberTest.t
deleted file mode 100644
index 39f1e67c5cdb..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesNumberTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesNumber');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesNumber->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesNumber');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesObjectTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesObjectTest.t
deleted file mode 100644
index 7747e041c87e..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesObjectTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesObject');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesObject->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesObject');
-
diff --git a/samples/client/petstore/perl/t/AdditionalPropertiesStringTest.t b/samples/client/petstore/perl/t/AdditionalPropertiesStringTest.t
deleted file mode 100644
index aba320141d46..000000000000
--- a/samples/client/petstore/perl/t/AdditionalPropertiesStringTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::AdditionalPropertiesString');
-
-my $instance = WWW::OpenAPIClient::Object::AdditionalPropertiesString->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::AdditionalPropertiesString');
-
diff --git a/samples/client/petstore/perl/t/AdultTest.t b/samples/client/petstore/perl/t/AdultTest.t
deleted file mode 100644
index b76d0b23bdcb..000000000000
--- a/samples/client/petstore/perl/t/AdultTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::Adult');
-
-my $instance = WWW::OpenAPIClient::Object::Adult->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Adult');
-
diff --git a/samples/client/petstore/perl/t/AnimalTest.t b/samples/client/petstore/perl/t/AnimalTest.t
index 129d5e09d894..da13cadf9d62 100644
--- a/samples/client/petstore/perl/t/AnimalTest.t
+++ b/samples/client/petstore/perl/t/AnimalTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Animal');
 
-my $instance = WWW::OpenAPIClient::Object::Animal->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Animal');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Animal->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Animal');
 
diff --git a/samples/client/petstore/perl/t/AnotherFakeApiTest.t b/samples/client/petstore/perl/t/AnotherFakeApiTest.t
index 52d6452f0a3c..8efef9baceed 100644
--- a/samples/client/petstore/perl/t/AnotherFakeApiTest.t
+++ b/samples/client/petstore/perl/t/AnotherFakeApiTest.t
@@ -32,10 +32,7 @@ isa_ok($api, 'WWW::OpenAPIClient::AnotherFakeApi');
 #
 # call_123_test_special_tags test
 #
-{
-    my $body = undef; # replace NULL with a proper value
-    my $result = $api->call_123_test_special_tags(body => $body);
-}
+# uncomment below and update the test
+#my $call_123_test_special_tags_client = undef; # replace NULL with a proper value
+#my $call_123_test_special_tags_result = $api->call_123_test_special_tags(client => $call_123_test_special_tags_client);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/ApiResponseTest.t b/samples/client/petstore/perl/t/ApiResponseTest.t
index 51f6df87d544..ba9e4fc212b6 100644
--- a/samples/client/petstore/perl/t/ApiResponseTest.t
+++ b/samples/client/petstore/perl/t/ApiResponseTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ApiResponse');
 
-my $instance = WWW::OpenAPIClient::Object::ApiResponse->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ApiResponse');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ApiResponse->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ApiResponse');
 
diff --git a/samples/client/petstore/perl/t/ArrayOfArrayOfNumberOnlyTest.t b/samples/client/petstore/perl/t/ArrayOfArrayOfNumberOnlyTest.t
index 31a328b18576..80ea0374e832 100644
--- a/samples/client/petstore/perl/t/ArrayOfArrayOfNumberOnlyTest.t
+++ b/samples/client/petstore/perl/t/ArrayOfArrayOfNumberOnlyTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ArrayOfArrayOfNumberOnly');
 
-my $instance = WWW::OpenAPIClient::Object::ArrayOfArrayOfNumberOnly->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayOfArrayOfNumberOnly');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ArrayOfArrayOfNumberOnly->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayOfArrayOfNumberOnly');
 
diff --git a/samples/client/petstore/perl/t/ArrayOfNumberOnlyTest.t b/samples/client/petstore/perl/t/ArrayOfNumberOnlyTest.t
index 0cc6cb308e9f..aa9c65709065 100644
--- a/samples/client/petstore/perl/t/ArrayOfNumberOnlyTest.t
+++ b/samples/client/petstore/perl/t/ArrayOfNumberOnlyTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ArrayOfNumberOnly');
 
-my $instance = WWW::OpenAPIClient::Object::ArrayOfNumberOnly->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayOfNumberOnly');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ArrayOfNumberOnly->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayOfNumberOnly');
 
diff --git a/samples/client/petstore/perl/t/ArrayTestTest.t b/samples/client/petstore/perl/t/ArrayTestTest.t
index 732567b7ec1a..d2b1188f08ce 100644
--- a/samples/client/petstore/perl/t/ArrayTestTest.t
+++ b/samples/client/petstore/perl/t/ArrayTestTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ArrayTest');
 
-my $instance = WWW::OpenAPIClient::Object::ArrayTest->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayTest');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ArrayTest->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ArrayTest');
 
diff --git a/samples/client/petstore/perl/t/BigCatTest.t b/samples/client/petstore/perl/t/BigCatTest.t
deleted file mode 100644
index b1d4d7966bf3..000000000000
--- a/samples/client/petstore/perl/t/BigCatTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-The version of the OpenAPI document: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::BigCat');
-
-my $instance = WWW::OpenAPIClient::Object::BigCat->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::BigCat');
-
diff --git a/samples/client/petstore/perl/t/CapitalizationTest.t b/samples/client/petstore/perl/t/CapitalizationTest.t
index ec850822ed47..b9809bd1aa78 100644
--- a/samples/client/petstore/perl/t/CapitalizationTest.t
+++ b/samples/client/petstore/perl/t/CapitalizationTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Capitalization');
 
-my $instance = WWW::OpenAPIClient::Object::Capitalization->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Capitalization');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Capitalization->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Capitalization');
 
diff --git a/samples/client/petstore/perl/t/CatAllOfTest.t b/samples/client/petstore/perl/t/CatAllOfTest.t
index 4cccac8672eb..67d33cf5d32e 100644
--- a/samples/client/petstore/perl/t/CatAllOfTest.t
+++ b/samples/client/petstore/perl/t/CatAllOfTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::CatAllOf');
 
-my $instance = WWW::OpenAPIClient::Object::CatAllOf->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::CatAllOf');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::CatAllOf->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::CatAllOf');
 
diff --git a/samples/client/petstore/perl/t/CatTest.t b/samples/client/petstore/perl/t/CatTest.t
index 1413f5e6b30c..56df7dee63df 100644
--- a/samples/client/petstore/perl/t/CatTest.t
+++ b/samples/client/petstore/perl/t/CatTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Cat');
 
-my $instance = WWW::OpenAPIClient::Object::Cat->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Cat');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Cat->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Cat');
 
diff --git a/samples/client/petstore/perl/t/CategoryTest.t b/samples/client/petstore/perl/t/CategoryTest.t
index 5fc384264b86..bcb06e64554b 100644
--- a/samples/client/petstore/perl/t/CategoryTest.t
+++ b/samples/client/petstore/perl/t/CategoryTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Category');
 
-my $instance = WWW::OpenAPIClient::Object::Category->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Category');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Category->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Category');
 
diff --git a/samples/client/petstore/perl/t/ChildTest.t b/samples/client/petstore/perl/t/ChildTest.t
deleted file mode 100644
index f58e2c50c03a..000000000000
--- a/samples/client/petstore/perl/t/ChildTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::Child');
-
-my $instance = WWW::OpenAPIClient::Object::Child->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Child');
-
diff --git a/samples/client/petstore/perl/t/ClassModelTest.t b/samples/client/petstore/perl/t/ClassModelTest.t
index 327466479f4e..cdbae32e3ca3 100644
--- a/samples/client/petstore/perl/t/ClassModelTest.t
+++ b/samples/client/petstore/perl/t/ClassModelTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ClassModel');
 
-my $instance = WWW::OpenAPIClient::Object::ClassModel->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ClassModel');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ClassModel->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ClassModel');
 
diff --git a/samples/client/petstore/perl/t/ClientTest.t b/samples/client/petstore/perl/t/ClientTest.t
index a084665d3cfb..6861bc971539 100644
--- a/samples/client/petstore/perl/t/ClientTest.t
+++ b/samples/client/petstore/perl/t/ClientTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Client');
 
-my $instance = WWW::OpenAPIClient::Object::Client->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Client');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Client->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Client');
 
diff --git a/samples/client/petstore/perl/t/DefaultApiTest.t b/samples/client/petstore/perl/t/DefaultApiTest.t
index c14be6c6707d..16155a2d403a 100644
--- a/samples/client/petstore/perl/t/DefaultApiTest.t
+++ b/samples/client/petstore/perl/t/DefaultApiTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -32,9 +32,6 @@ isa_ok($api, 'WWW::OpenAPIClient::DefaultApi');
 #
 # foo_get test
 #
-{
-    my $result = $api->foo_get();
-}
+# uncomment below and update the test
+#my $foo_get_result = $api->foo_get();
 
-
-1;
diff --git a/samples/client/petstore/perl/t/DogAllOfTest.t b/samples/client/petstore/perl/t/DogAllOfTest.t
index 441bfc786339..6660506bf9ef 100644
--- a/samples/client/petstore/perl/t/DogAllOfTest.t
+++ b/samples/client/petstore/perl/t/DogAllOfTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::DogAllOf');
 
-my $instance = WWW::OpenAPIClient::Object::DogAllOf->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::DogAllOf');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::DogAllOf->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::DogAllOf');
 
diff --git a/samples/client/petstore/perl/t/DogTest.t b/samples/client/petstore/perl/t/DogTest.t
index c7c6505b5ed7..285ce98c7073 100644
--- a/samples/client/petstore/perl/t/DogTest.t
+++ b/samples/client/petstore/perl/t/DogTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Dog');
 
-my $instance = WWW::OpenAPIClient::Object::Dog->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Dog');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Dog->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Dog');
 
diff --git a/samples/client/petstore/perl/t/EnumArraysTest.t b/samples/client/petstore/perl/t/EnumArraysTest.t
index e1541efc4359..6be5ccb047b3 100644
--- a/samples/client/petstore/perl/t/EnumArraysTest.t
+++ b/samples/client/petstore/perl/t/EnumArraysTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::EnumArrays');
 
-my $instance = WWW::OpenAPIClient::Object::EnumArrays->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumArrays');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::EnumArrays->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumArrays');
 
diff --git a/samples/client/petstore/perl/t/EnumClassTest.t b/samples/client/petstore/perl/t/EnumClassTest.t
index 56065ea9ed69..4e22665ef6cc 100644
--- a/samples/client/petstore/perl/t/EnumClassTest.t
+++ b/samples/client/petstore/perl/t/EnumClassTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::EnumClass');
 
-my $instance = WWW::OpenAPIClient::Object::EnumClass->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumClass');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::EnumClass->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumClass');
 
diff --git a/samples/client/petstore/perl/t/EnumTestTest.t b/samples/client/petstore/perl/t/EnumTestTest.t
index 68213a1a9514..8a84c3417d9b 100644
--- a/samples/client/petstore/perl/t/EnumTestTest.t
+++ b/samples/client/petstore/perl/t/EnumTestTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::EnumTest');
 
-my $instance = WWW::OpenAPIClient::Object::EnumTest->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumTest');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::EnumTest->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::EnumTest');
 
diff --git a/samples/client/petstore/perl/t/FakeApiTest.t b/samples/client/petstore/perl/t/FakeApiTest.t
index 7a14792afe77..512767a782be 100644
--- a/samples/client/petstore/perl/t/FakeApiTest.t
+++ b/samples/client/petstore/perl/t/FakeApiTest.t
@@ -32,154 +32,144 @@ isa_ok($api, 'WWW::OpenAPIClient::FakeApi');
 #
 # fake_health_get test
 #
-{
-    my $result = $api->fake_health_get();
-}
+# uncomment below and update the test
+#my $fake_health_get_result = $api->fake_health_get();
 
 #
 # fake_http_signature_test test
 #
-{
-    my $pet = undef; # replace NULL with a proper value
-    my $query_1 = undef; # replace NULL with a proper value
-    my $header_1 = undef; # replace NULL with a proper value
-    my $result = $api->fake_http_signature_test(pet => $pet, query_1 => $query_1, header_1 => $header_1);
-}
+# uncomment below and update the test
+#my $fake_http_signature_test_pet = undef; # replace NULL with a proper value
+#my $fake_http_signature_test_query_1 = undef; # replace NULL with a proper value
+#my $fake_http_signature_test_header_1 = undef; # replace NULL with a proper value
+#my $fake_http_signature_test_result = $api->fake_http_signature_test(pet => $fake_http_signature_test_pet, query_1 => $fake_http_signature_test_query_1, header_1 => $fake_http_signature_test_header_1);
 
 #
 # fake_outer_boolean_serialize test
 #
-{
-    my $body = undef; # replace NULL with a proper value
-    my $result = $api->fake_outer_boolean_serialize(body => $body);
-}
+# uncomment below and update the test
+#my $fake_outer_boolean_serialize_body = undef; # replace NULL with a proper value
+#my $fake_outer_boolean_serialize_result = $api->fake_outer_boolean_serialize(body => $fake_outer_boolean_serialize_body);
 
 #
 # fake_outer_composite_serialize test
 #
-{
-    my $outer_composite = undef; # replace NULL with a proper value
-    my $result = $api->fake_outer_composite_serialize(outer_composite => $outer_composite);
-}
+# uncomment below and update the test
+#my $fake_outer_composite_serialize_outer_composite = undef; # replace NULL with a proper value
+#my $fake_outer_composite_serialize_result = $api->fake_outer_composite_serialize(outer_composite => $fake_outer_composite_serialize_outer_composite);
 
 #
 # fake_outer_number_serialize test
 #
-{
-    my $body = undef; # replace NULL with a proper value
-    my $result = $api->fake_outer_number_serialize(body => $body);
-}
+# uncomment below and update the test
+#my $fake_outer_number_serialize_body = undef; # replace NULL with a proper value
+#my $fake_outer_number_serialize_result = $api->fake_outer_number_serialize(body => $fake_outer_number_serialize_body);
 
 #
 # fake_outer_string_serialize test
 #
-{
-    my $body = undef; # replace NULL with a proper value
-    my $result = $api->fake_outer_string_serialize(body => $body);
-}
+# uncomment below and update the test
+#my $fake_outer_string_serialize_body = undef; # replace NULL with a proper value
+#my $fake_outer_string_serialize_result = $api->fake_outer_string_serialize(body => $fake_outer_string_serialize_body);
+
+#
+# fake_property_enum_integer_serialize test
+#
+# uncomment below and update the test
+#my $fake_property_enum_integer_serialize_outer_object_with_enum_property = undef; # replace NULL with a proper value
+#my $fake_property_enum_integer_serialize_result = $api->fake_property_enum_integer_serialize(outer_object_with_enum_property => $fake_property_enum_integer_serialize_outer_object_with_enum_property);
 
 #
 # test_body_with_file_schema test
 #
-{
-    my $file_schema_test_class = undef; # replace NULL with a proper value
-    my $result = $api->test_body_with_file_schema(file_schema_test_class => $file_schema_test_class);
-}
+# uncomment below and update the test
+#my $test_body_with_file_schema_file_schema_test_class = undef; # replace NULL with a proper value
+#my $test_body_with_file_schema_result = $api->test_body_with_file_schema(file_schema_test_class => $test_body_with_file_schema_file_schema_test_class);
 
 #
 # test_body_with_query_params test
 #
-{
-    my $query = undef; # replace NULL with a proper value
-    my $user = undef; # replace NULL with a proper value
-    my $result = $api->test_body_with_query_params(query => $query, user => $user);
-}
+# uncomment below and update the test
+#my $test_body_with_query_params_query = undef; # replace NULL with a proper value
+#my $test_body_with_query_params_user = undef; # replace NULL with a proper value
+#my $test_body_with_query_params_result = $api->test_body_with_query_params(query => $test_body_with_query_params_query, user => $test_body_with_query_params_user);
 
 #
 # test_client_model test
 #
-{
-    my $client = undef; # replace NULL with a proper value
-    my $result = $api->test_client_model(client => $client);
-}
+# uncomment below and update the test
+#my $test_client_model_client = undef; # replace NULL with a proper value
+#my $test_client_model_result = $api->test_client_model(client => $test_client_model_client);
 
 #
 # test_endpoint_parameters test
 #
-{
-    my $number = undef; # replace NULL with a proper value
-    my $double = undef; # replace NULL with a proper value
-    my $pattern_without_delimiter = undef; # replace NULL with a proper value
-    my $byte = undef; # replace NULL with a proper value
-    my $integer = undef; # replace NULL with a proper value
-    my $int32 = undef; # replace NULL with a proper value
-    my $int64 = undef; # replace NULL with a proper value
-    my $float = undef; # replace NULL with a proper value
-    my $string = undef; # replace NULL with a proper value
-    my $binary = undef; # replace NULL with a proper value
-    my $date = undef; # replace NULL with a proper value
-    my $date_time = undef; # replace NULL with a proper value
-    my $password = undef; # replace NULL with a proper value
-    my $callback = undef; # replace NULL with a proper value
-    my $result = $api->test_endpoint_parameters(number => $number, double => $double, pattern_without_delimiter => $pattern_without_delimiter, byte => $byte, integer => $integer, int32 => $int32, int64 => $int64, float => $float, string => $string, binary => $binary, date => $date, date_time => $date_time, password => $password, callback => $callback);
-}
+# uncomment below and update the test
+#my $test_endpoint_parameters_number = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_double = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_pattern_without_delimiter = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_byte = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_integer = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_int32 = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_int64 = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_float = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_string = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_binary = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_date = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_date_time = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_password = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_callback = undef; # replace NULL with a proper value
+#my $test_endpoint_parameters_result = $api->test_endpoint_parameters(number => $test_endpoint_parameters_number, double => $test_endpoint_parameters_double, pattern_without_delimiter => $test_endpoint_parameters_pattern_without_delimiter, byte => $test_endpoint_parameters_byte, integer => $test_endpoint_parameters_integer, int32 => $test_endpoint_parameters_int32, int64 => $test_endpoint_parameters_int64, float => $test_endpoint_parameters_float, string => $test_endpoint_parameters_string, binary => $test_endpoint_parameters_binary, date => $test_endpoint_parameters_date, date_time => $test_endpoint_parameters_date_time, password => $test_endpoint_parameters_password, callback => $test_endpoint_parameters_callback);
 
 #
 # test_enum_parameters test
 #
-{
-    my $enum_header_string_array = undef; # replace NULL with a proper value
-    my $enum_header_string = undef; # replace NULL with a proper value
-    my $enum_query_string_array = undef; # replace NULL with a proper value
-    my $enum_query_string = undef; # replace NULL with a proper value
-    my $enum_query_integer = undef; # replace NULL with a proper value
-    my $enum_query_double = undef; # replace NULL with a proper value
-    my $enum_form_string_array = undef; # replace NULL with a proper value
-    my $enum_form_string = undef; # replace NULL with a proper value
-    my $result = $api->test_enum_parameters(enum_header_string_array => $enum_header_string_array, enum_header_string => $enum_header_string, enum_query_string_array => $enum_query_string_array, enum_query_string => $enum_query_string, enum_query_integer => $enum_query_integer, enum_query_double => $enum_query_double, enum_form_string_array => $enum_form_string_array, enum_form_string => $enum_form_string);
-}
+# uncomment below and update the test
+#my $test_enum_parameters_enum_header_string_array = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_header_string = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_query_string_array = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_query_string = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_query_integer = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_query_double = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_form_string_array = undef; # replace NULL with a proper value
+#my $test_enum_parameters_enum_form_string = undef; # replace NULL with a proper value
+#my $test_enum_parameters_result = $api->test_enum_parameters(enum_header_string_array => $test_enum_parameters_enum_header_string_array, enum_header_string => $test_enum_parameters_enum_header_string, enum_query_string_array => $test_enum_parameters_enum_query_string_array, enum_query_string => $test_enum_parameters_enum_query_string, enum_query_integer => $test_enum_parameters_enum_query_integer, enum_query_double => $test_enum_parameters_enum_query_double, enum_form_string_array => $test_enum_parameters_enum_form_string_array, enum_form_string => $test_enum_parameters_enum_form_string);
 
 #
 # test_group_parameters test
 #
-{
-    my $required_string_group = undef; # replace NULL with a proper value
-    my $required_boolean_group = undef; # replace NULL with a proper value
-    my $required_int64_group = undef; # replace NULL with a proper value
-    my $string_group = undef; # replace NULL with a proper value
-    my $boolean_group = undef; # replace NULL with a proper value
-    my $int64_group = undef; # replace NULL with a proper value
-    my $result = $api->test_group_parameters(required_string_group => $required_string_group, required_boolean_group => $required_boolean_group, required_int64_group => $required_int64_group, string_group => $string_group, boolean_group => $boolean_group, int64_group => $int64_group);
-}
+# uncomment below and update the test
+#my $test_group_parameters_required_string_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_required_boolean_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_required_int64_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_string_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_boolean_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_int64_group = undef; # replace NULL with a proper value
+#my $test_group_parameters_result = $api->test_group_parameters(required_string_group => $test_group_parameters_required_string_group, required_boolean_group => $test_group_parameters_required_boolean_group, required_int64_group => $test_group_parameters_required_int64_group, string_group => $test_group_parameters_string_group, boolean_group => $test_group_parameters_boolean_group, int64_group => $test_group_parameters_int64_group);
 
 #
 # test_inline_additional_properties test
 #
-{
-    my $request_body = undef; # replace NULL with a proper value
-    my $result = $api->test_inline_additional_properties(request_body => $request_body);
-}
+# uncomment below and update the test
+#my $test_inline_additional_properties_request_body = undef; # replace NULL with a proper value
+#my $test_inline_additional_properties_result = $api->test_inline_additional_properties(request_body => $test_inline_additional_properties_request_body);
 
 #
 # test_json_form_data test
 #
-{
-    my $param = undef; # replace NULL with a proper value
-    my $param2 = undef; # replace NULL with a proper value
-    my $result = $api->test_json_form_data(param => $param, param2 => $param2);
-}
+# uncomment below and update the test
+#my $test_json_form_data_param = undef; # replace NULL with a proper value
+#my $test_json_form_data_param2 = undef; # replace NULL with a proper value
+#my $test_json_form_data_result = $api->test_json_form_data(param => $test_json_form_data_param, param2 => $test_json_form_data_param2);
 
 #
 # test_query_parameter_collection_format test
 #
-{
-    my $pipe = undef; # replace NULL with a proper value
-    my $ioutil = undef; # replace NULL with a proper value
-    my $http = undef; # replace NULL with a proper value
-    my $url = undef; # replace NULL with a proper value
-    my $context = undef; # replace NULL with a proper value
-    my $result = $api->test_query_parameter_collection_format(pipe => $pipe, ioutil => $ioutil, http => $http, url => $url, context => $context);
-}
+# uncomment below and update the test
+#my $test_query_parameter_collection_format_pipe = undef; # replace NULL with a proper value
+#my $test_query_parameter_collection_format_ioutil = undef; # replace NULL with a proper value
+#my $test_query_parameter_collection_format_http = undef; # replace NULL with a proper value
+#my $test_query_parameter_collection_format_url = undef; # replace NULL with a proper value
+#my $test_query_parameter_collection_format_context = undef; # replace NULL with a proper value
+#my $test_query_parameter_collection_format_result = $api->test_query_parameter_collection_format(pipe => $test_query_parameter_collection_format_pipe, ioutil => $test_query_parameter_collection_format_ioutil, http => $test_query_parameter_collection_format_http, url => $test_query_parameter_collection_format_url, context => $test_query_parameter_collection_format_context);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/FakeClassnameTags123ApiTest.t b/samples/client/petstore/perl/t/FakeClassnameTags123ApiTest.t
index 009586521bdb..6bbbac594b8c 100644
--- a/samples/client/petstore/perl/t/FakeClassnameTags123ApiTest.t
+++ b/samples/client/petstore/perl/t/FakeClassnameTags123ApiTest.t
@@ -32,10 +32,7 @@ isa_ok($api, 'WWW::OpenAPIClient::FakeClassnameTags123Api');
 #
 # test_classname test
 #
-{
-    my $client = undef; # replace NULL with a proper value
-    my $result = $api->test_classname(client => $client);
-}
+# uncomment below and update the test
+#my $test_classname_client = undef; # replace NULL with a proper value
+#my $test_classname_result = $api->test_classname(client => $test_classname_client);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/FileSchemaTestClassTest.t b/samples/client/petstore/perl/t/FileSchemaTestClassTest.t
index b7a2a6d282e4..040d6d955964 100644
--- a/samples/client/petstore/perl/t/FileSchemaTestClassTest.t
+++ b/samples/client/petstore/perl/t/FileSchemaTestClassTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::FileSchemaTestClass');
 
-my $instance = WWW::OpenAPIClient::Object::FileSchemaTestClass->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::FileSchemaTestClass');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::FileSchemaTestClass->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::FileSchemaTestClass');
 
diff --git a/samples/client/petstore/perl/t/FileTest.t b/samples/client/petstore/perl/t/FileTest.t
index 99f8eca953f7..59a96f574cda 100644
--- a/samples/client/petstore/perl/t/FileTest.t
+++ b/samples/client/petstore/perl/t/FileTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::File');
 
-my $instance = WWW::OpenAPIClient::Object::File->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::File');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::File->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::File');
 
diff --git a/samples/client/petstore/perl/t/FooTest.t b/samples/client/petstore/perl/t/FooTest.t
index 84aabda5c410..5ce9e8b66a4e 100644
--- a/samples/client/petstore/perl/t/FooTest.t
+++ b/samples/client/petstore/perl/t/FooTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Foo');
 
-my $instance = WWW::OpenAPIClient::Object::Foo->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Foo');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Foo->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Foo');
 
diff --git a/samples/client/petstore/perl/t/FormatTestTest.t b/samples/client/petstore/perl/t/FormatTestTest.t
index 7198d770059f..78bf3cafb1d3 100644
--- a/samples/client/petstore/perl/t/FormatTestTest.t
+++ b/samples/client/petstore/perl/t/FormatTestTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::FormatTest');
 
-my $instance = WWW::OpenAPIClient::Object::FormatTest->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::FormatTest');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::FormatTest->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::FormatTest');
 
diff --git a/samples/client/petstore/perl/t/HasOnlyReadOnlyTest.t b/samples/client/petstore/perl/t/HasOnlyReadOnlyTest.t
index 4bbe9bc3116e..8c4007b946a9 100644
--- a/samples/client/petstore/perl/t/HasOnlyReadOnlyTest.t
+++ b/samples/client/petstore/perl/t/HasOnlyReadOnlyTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::HasOnlyReadOnly');
 
-my $instance = WWW::OpenAPIClient::Object::HasOnlyReadOnly->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::HasOnlyReadOnly');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::HasOnlyReadOnly->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::HasOnlyReadOnly');
 
diff --git a/samples/client/petstore/perl/t/HealthCheckResultTest.t b/samples/client/petstore/perl/t/HealthCheckResultTest.t
index f4309db10dd8..6e5e4b0f964c 100644
--- a/samples/client/petstore/perl/t/HealthCheckResultTest.t
+++ b/samples/client/petstore/perl/t/HealthCheckResultTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::HealthCheckResult');
 
-my $instance = WWW::OpenAPIClient::Object::HealthCheckResult->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::HealthCheckResult');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::HealthCheckResult->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::HealthCheckResult');
 
diff --git a/samples/client/petstore/perl/t/HumanTest.t b/samples/client/petstore/perl/t/HumanTest.t
deleted file mode 100644
index 0bf47c04df01..000000000000
--- a/samples/client/petstore/perl/t/HumanTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::Human');
-
-my $instance = WWW::OpenAPIClient::Object::Human->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Human');
-
diff --git a/samples/client/petstore/perl/t/InlineObject1Test.t b/samples/client/petstore/perl/t/InlineObject1Test.t
deleted file mode 100644
index e2f054ad6bdb..000000000000
--- a/samples/client/petstore/perl/t/InlineObject1Test.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject1');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject1->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject1');
-
diff --git a/samples/client/petstore/perl/t/InlineObject2Test.t b/samples/client/petstore/perl/t/InlineObject2Test.t
deleted file mode 100644
index 1f5890f3466f..000000000000
--- a/samples/client/petstore/perl/t/InlineObject2Test.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject2');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject2->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject2');
-
diff --git a/samples/client/petstore/perl/t/InlineObject3Test.t b/samples/client/petstore/perl/t/InlineObject3Test.t
deleted file mode 100644
index 3861c16ca8cb..000000000000
--- a/samples/client/petstore/perl/t/InlineObject3Test.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject3');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject3->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject3');
-
diff --git a/samples/client/petstore/perl/t/InlineObject4Test.t b/samples/client/petstore/perl/t/InlineObject4Test.t
deleted file mode 100644
index 5949bc4ac8b5..000000000000
--- a/samples/client/petstore/perl/t/InlineObject4Test.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject4');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject4->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject4');
-
diff --git a/samples/client/petstore/perl/t/InlineObject5Test.t b/samples/client/petstore/perl/t/InlineObject5Test.t
deleted file mode 100644
index dcce5288ea1e..000000000000
--- a/samples/client/petstore/perl/t/InlineObject5Test.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject5');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject5->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject5');
-
diff --git a/samples/client/petstore/perl/t/InlineObjectTest.t b/samples/client/petstore/perl/t/InlineObjectTest.t
deleted file mode 100644
index 055490acd2ed..000000000000
--- a/samples/client/petstore/perl/t/InlineObjectTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::InlineObject');
-
-my $instance = WWW::OpenAPIClient::Object::InlineObject->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineObject');
-
diff --git a/samples/client/petstore/perl/t/InlineResponseDefaultTest.t b/samples/client/petstore/perl/t/InlineResponseDefaultTest.t
index 36336e35268d..2b3da22fde3e 100644
--- a/samples/client/petstore/perl/t/InlineResponseDefaultTest.t
+++ b/samples/client/petstore/perl/t/InlineResponseDefaultTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::InlineResponseDefault');
 
-my $instance = WWW::OpenAPIClient::Object::InlineResponseDefault->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineResponseDefault');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::InlineResponseDefault->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::InlineResponseDefault');
 
diff --git a/samples/client/petstore/perl/t/ListTest.t b/samples/client/petstore/perl/t/ListTest.t
index 62667a725ecd..484f357bcb3a 100644
--- a/samples/client/petstore/perl/t/ListTest.t
+++ b/samples/client/petstore/perl/t/ListTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::List');
 
-my $instance = WWW::OpenAPIClient::Object::List->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::List');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::List->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::List');
 
diff --git a/samples/client/petstore/perl/t/MapTestTest.t b/samples/client/petstore/perl/t/MapTestTest.t
index 44f6d2623902..08e0e76365e5 100644
--- a/samples/client/petstore/perl/t/MapTestTest.t
+++ b/samples/client/petstore/perl/t/MapTestTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::MapTest');
 
-my $instance = WWW::OpenAPIClient::Object::MapTest->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::MapTest');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::MapTest->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::MapTest');
 
diff --git a/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t b/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t
index bdbc94cf2f26..32fc58f324e0 100644
--- a/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t
+++ b/samples/client/petstore/perl/t/MixedPropertiesAndAdditionalPropertiesClassTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::MixedPropertiesAndAdditionalPropertiesClass');
 
-my $instance = WWW::OpenAPIClient::Object::MixedPropertiesAndAdditionalPropertiesClass->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::MixedPropertiesAndAdditionalPropertiesClass');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::MixedPropertiesAndAdditionalPropertiesClass->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::MixedPropertiesAndAdditionalPropertiesClass');
 
diff --git a/samples/client/petstore/perl/t/Model200ResponseTest.t b/samples/client/petstore/perl/t/Model200ResponseTest.t
index 73d5e9f64190..603e1c1471cb 100644
--- a/samples/client/petstore/perl/t/Model200ResponseTest.t
+++ b/samples/client/petstore/perl/t/Model200ResponseTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Model200Response');
 
-my $instance = WWW::OpenAPIClient::Object::Model200Response->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Model200Response');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Model200Response->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Model200Response');
 
diff --git a/samples/client/petstore/perl/t/ModelReturnTest.t b/samples/client/petstore/perl/t/ModelReturnTest.t
index 1d659c2b66be..283ed51adae7 100644
--- a/samples/client/petstore/perl/t/ModelReturnTest.t
+++ b/samples/client/petstore/perl/t/ModelReturnTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ModelReturn');
 
-my $instance = WWW::OpenAPIClient::Object::ModelReturn->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ModelReturn');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ModelReturn->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ModelReturn');
 
diff --git a/samples/client/petstore/perl/t/NameTest.t b/samples/client/petstore/perl/t/NameTest.t
index b057ae251630..eb0f0e9bc887 100644
--- a/samples/client/petstore/perl/t/NameTest.t
+++ b/samples/client/petstore/perl/t/NameTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Name');
 
-my $instance = WWW::OpenAPIClient::Object::Name->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Name');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Name->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Name');
 
diff --git a/samples/client/petstore/perl/t/NullableClassTest.t b/samples/client/petstore/perl/t/NullableClassTest.t
index 20709824493a..932dfe3a950a 100644
--- a/samples/client/petstore/perl/t/NullableClassTest.t
+++ b/samples/client/petstore/perl/t/NullableClassTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::NullableClass');
 
-my $instance = WWW::OpenAPIClient::Object::NullableClass->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::NullableClass');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::NullableClass->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::NullableClass');
 
diff --git a/samples/client/petstore/perl/t/NumberOnlyTest.t b/samples/client/petstore/perl/t/NumberOnlyTest.t
index 07608ececed4..710bddd63400 100644
--- a/samples/client/petstore/perl/t/NumberOnlyTest.t
+++ b/samples/client/petstore/perl/t/NumberOnlyTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::NumberOnly');
 
-my $instance = WWW::OpenAPIClient::Object::NumberOnly->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::NumberOnly');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::NumberOnly->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::NumberOnly');
 
diff --git a/samples/client/petstore/perl/t/OrderTest.t b/samples/client/petstore/perl/t/OrderTest.t
index 926a223b52d0..08499ad4d9c4 100644
--- a/samples/client/petstore/perl/t/OrderTest.t
+++ b/samples/client/petstore/perl/t/OrderTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Order');
 
-my $instance = WWW::OpenAPIClient::Object::Order->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Order');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Order->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Order');
 
diff --git a/samples/client/petstore/perl/t/OuterCompositeTest.t b/samples/client/petstore/perl/t/OuterCompositeTest.t
index 6e74d3868dd0..3e23fa93c337 100644
--- a/samples/client/petstore/perl/t/OuterCompositeTest.t
+++ b/samples/client/petstore/perl/t/OuterCompositeTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::OuterComposite');
 
-my $instance = WWW::OpenAPIClient::Object::OuterComposite->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterComposite');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterComposite->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterComposite');
 
diff --git a/samples/client/petstore/perl/t/OuterEnumDefaultValueTest.t b/samples/client/petstore/perl/t/OuterEnumDefaultValueTest.t
index 860c5dcbeead..7b52c276fa02 100644
--- a/samples/client/petstore/perl/t/OuterEnumDefaultValueTest.t
+++ b/samples/client/petstore/perl/t/OuterEnumDefaultValueTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::OuterEnumDefaultValue');
 
-my $instance = WWW::OpenAPIClient::Object::OuterEnumDefaultValue->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumDefaultValue');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterEnumDefaultValue->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumDefaultValue');
 
diff --git a/samples/client/petstore/perl/t/OuterEnumIntegerDefaultValueTest.t b/samples/client/petstore/perl/t/OuterEnumIntegerDefaultValueTest.t
index 54ff32ad6fef..56e114ab16a0 100644
--- a/samples/client/petstore/perl/t/OuterEnumIntegerDefaultValueTest.t
+++ b/samples/client/petstore/perl/t/OuterEnumIntegerDefaultValueTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue');
 
-my $instance = WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumIntegerDefaultValue');
 
diff --git a/samples/client/petstore/perl/t/OuterEnumIntegerTest.t b/samples/client/petstore/perl/t/OuterEnumIntegerTest.t
index 5e2be8cfef4e..b10b2e69d45a 100644
--- a/samples/client/petstore/perl/t/OuterEnumIntegerTest.t
+++ b/samples/client/petstore/perl/t/OuterEnumIntegerTest.t
@@ -4,7 +4,7 @@ OpenAPI Petstore
 
 This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
 
-OpenAPI spec version: 1.0.0
+The version of the OpenAPI document: 1.0.0
 
 Generated by: https://openapi-generator.tech
 
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::OuterEnumInteger');
 
-my $instance = WWW::OpenAPIClient::Object::OuterEnumInteger->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumInteger');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterEnumInteger->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnumInteger');
 
diff --git a/samples/client/petstore/perl/t/OuterEnumTest.t b/samples/client/petstore/perl/t/OuterEnumTest.t
index 92d1571ab60b..39fd44262814 100644
--- a/samples/client/petstore/perl/t/OuterEnumTest.t
+++ b/samples/client/petstore/perl/t/OuterEnumTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::OuterEnum');
 
-my $instance = WWW::OpenAPIClient::Object::OuterEnum->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnum');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterEnum->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterEnum');
 
diff --git a/samples/client/petstore/perl/t/BigCatAllOfTest.t b/samples/client/petstore/perl/t/OuterObjectWithEnumPropertyTest.t
similarity index 67%
rename from samples/client/petstore/perl/t/BigCatAllOfTest.t
rename to samples/client/petstore/perl/t/OuterObjectWithEnumPropertyTest.t
index 5708cbf33460..b28dd8492b33 100644
--- a/samples/client/petstore/perl/t/BigCatAllOfTest.t
+++ b/samples/client/petstore/perl/t/OuterObjectWithEnumPropertyTest.t
@@ -25,9 +25,10 @@ use strict;
 use warnings;
 
 
-use_ok('WWW::OpenAPIClient::Object::BigCatAllOf');
+use_ok('WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty');
 
-my $instance = WWW::OpenAPIClient::Object::BigCatAllOf->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::BigCatAllOf');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::OuterObjectWithEnumProperty');
 
diff --git a/samples/client/petstore/perl/t/PersonTest.t b/samples/client/petstore/perl/t/PersonTest.t
deleted file mode 100644
index eceb9e5c1fcf..000000000000
--- a/samples/client/petstore/perl/t/PersonTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::Person');
-
-my $instance = WWW::OpenAPIClient::Object::Person->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Person');
-
diff --git a/samples/client/petstore/perl/t/PetApiTest.t b/samples/client/petstore/perl/t/PetApiTest.t
index 6a4a5d3e9908..479af7c718f1 100644
--- a/samples/client/petstore/perl/t/PetApiTest.t
+++ b/samples/client/petstore/perl/t/PetApiTest.t
@@ -32,81 +32,70 @@ isa_ok($api, 'WWW::OpenAPIClient::PetApi');
 #
 # add_pet test
 #
-{
-    my $pet = undef; # replace NULL with a proper value
-    my $result = $api->add_pet(pet => $pet);
-}
+# uncomment below and update the test
+#my $add_pet_pet = undef; # replace NULL with a proper value
+#my $add_pet_result = $api->add_pet(pet => $add_pet_pet);
 
 #
 # delete_pet test
 #
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $api_key = undef; # replace NULL with a proper value
-    my $result = $api->delete_pet(pet_id => $pet_id, api_key => $api_key);
-}
+# uncomment below and update the test
+#my $delete_pet_pet_id = undef; # replace NULL with a proper value
+#my $delete_pet_api_key = undef; # replace NULL with a proper value
+#my $delete_pet_result = $api->delete_pet(pet_id => $delete_pet_pet_id, api_key => $delete_pet_api_key);
 
 #
 # find_pets_by_status test
 #
-{
-    my $status = undef; # replace NULL with a proper value
-    my $result = $api->find_pets_by_status(status => $status);
-}
+# uncomment below and update the test
+#my $find_pets_by_status_status = undef; # replace NULL with a proper value
+#my $find_pets_by_status_result = $api->find_pets_by_status(status => $find_pets_by_status_status);
 
 #
 # find_pets_by_tags test
 #
-{
-    my $tags = undef; # replace NULL with a proper value
-    my $result = $api->find_pets_by_tags(tags => $tags);
-}
+# uncomment below and update the test
+#my $find_pets_by_tags_tags = undef; # replace NULL with a proper value
+#my $find_pets_by_tags_result = $api->find_pets_by_tags(tags => $find_pets_by_tags_tags);
 
 #
 # get_pet_by_id test
 #
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $result = $api->get_pet_by_id(pet_id => $pet_id);
-}
+# uncomment below and update the test
+#my $get_pet_by_id_pet_id = undef; # replace NULL with a proper value
+#my $get_pet_by_id_result = $api->get_pet_by_id(pet_id => $get_pet_by_id_pet_id);
 
 #
 # update_pet test
 #
-{
-    my $pet = undef; # replace NULL with a proper value
-    my $result = $api->update_pet(pet => $pet);
-}
+# uncomment below and update the test
+#my $update_pet_pet = undef; # replace NULL with a proper value
+#my $update_pet_result = $api->update_pet(pet => $update_pet_pet);
 
 #
 # update_pet_with_form test
 #
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $name = undef; # replace NULL with a proper value
-    my $status = undef; # replace NULL with a proper value
-    my $result = $api->update_pet_with_form(pet_id => $pet_id, name => $name, status => $status);
-}
+# uncomment below and update the test
+#my $update_pet_with_form_pet_id = undef; # replace NULL with a proper value
+#my $update_pet_with_form_name = undef; # replace NULL with a proper value
+#my $update_pet_with_form_status = undef; # replace NULL with a proper value
+#my $update_pet_with_form_result = $api->update_pet_with_form(pet_id => $update_pet_with_form_pet_id, name => $update_pet_with_form_name, status => $update_pet_with_form_status);
 
 #
 # upload_file test
 #
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $additional_metadata = undef; # replace NULL with a proper value
-    my $file = undef; # replace NULL with a proper value
-    my $result = $api->upload_file(pet_id => $pet_id, additional_metadata => $additional_metadata, file => $file);
-}
+# uncomment below and update the test
+#my $upload_file_pet_id = undef; # replace NULL with a proper value
+#my $upload_file_additional_metadata = undef; # replace NULL with a proper value
+#my $upload_file_file = undef; # replace NULL with a proper value
+#my $upload_file_result = $api->upload_file(pet_id => $upload_file_pet_id, additional_metadata => $upload_file_additional_metadata, file => $upload_file_file);
 
 #
 # upload_file_with_required_file test
 #
-{
-    my $pet_id = undef; # replace NULL with a proper value
-    my $required_file = undef; # replace NULL with a proper value
-    my $additional_metadata = undef; # replace NULL with a proper value
-    my $result = $api->upload_file_with_required_file(pet_id => $pet_id, required_file => $required_file, additional_metadata => $additional_metadata);
-}
+# uncomment below and update the test
+#my $upload_file_with_required_file_pet_id = undef; # replace NULL with a proper value
+#my $upload_file_with_required_file_required_file = undef; # replace NULL with a proper value
+#my $upload_file_with_required_file_additional_metadata = undef; # replace NULL with a proper value
+#my $upload_file_with_required_file_result = $api->upload_file_with_required_file(pet_id => $upload_file_with_required_file_pet_id, required_file => $upload_file_with_required_file_required_file, additional_metadata => $upload_file_with_required_file_additional_metadata);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/PetTest.t b/samples/client/petstore/perl/t/PetTest.t
index 1b3fc969ea00..988648c4ed36 100644
--- a/samples/client/petstore/perl/t/PetTest.t
+++ b/samples/client/petstore/perl/t/PetTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Pet');
 
-my $instance = WWW::OpenAPIClient::Object::Pet->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Pet');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Pet->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Pet');
 
diff --git a/samples/client/petstore/perl/t/ReadOnlyFirstTest.t b/samples/client/petstore/perl/t/ReadOnlyFirstTest.t
index f384c20c003c..cf1360392035 100644
--- a/samples/client/petstore/perl/t/ReadOnlyFirstTest.t
+++ b/samples/client/petstore/perl/t/ReadOnlyFirstTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::ReadOnlyFirst');
 
-my $instance = WWW::OpenAPIClient::Object::ReadOnlyFirst->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::ReadOnlyFirst');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::ReadOnlyFirst->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::ReadOnlyFirst');
 
diff --git a/samples/client/petstore/perl/t/SpecialModelNameTest.t b/samples/client/petstore/perl/t/SpecialModelNameTest.t
index 0d24e9aaa285..8048dd3ab302 100644
--- a/samples/client/petstore/perl/t/SpecialModelNameTest.t
+++ b/samples/client/petstore/perl/t/SpecialModelNameTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::SpecialModelName');
 
-my $instance = WWW::OpenAPIClient::Object::SpecialModelName->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::SpecialModelName');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::SpecialModelName->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::SpecialModelName');
 
diff --git a/samples/client/petstore/perl/t/StoreApiTest.t b/samples/client/petstore/perl/t/StoreApiTest.t
index 6fae9f2f5fde..c2dcf8cd64b4 100644
--- a/samples/client/petstore/perl/t/StoreApiTest.t
+++ b/samples/client/petstore/perl/t/StoreApiTest.t
@@ -32,33 +32,27 @@ isa_ok($api, 'WWW::OpenAPIClient::StoreApi');
 #
 # delete_order test
 #
-{
-    my $order_id = undef; # replace NULL with a proper value
-    my $result = $api->delete_order(order_id => $order_id);
-}
+# uncomment below and update the test
+#my $delete_order_order_id = undef; # replace NULL with a proper value
+#my $delete_order_result = $api->delete_order(order_id => $delete_order_order_id);
 
 #
 # get_inventory test
 #
-{
-    my $result = $api->get_inventory();
-}
+# uncomment below and update the test
+#my $get_inventory_result = $api->get_inventory();
 
 #
 # get_order_by_id test
 #
-{
-    my $order_id = undef; # replace NULL with a proper value
-    my $result = $api->get_order_by_id(order_id => $order_id);
-}
+# uncomment below and update the test
+#my $get_order_by_id_order_id = undef; # replace NULL with a proper value
+#my $get_order_by_id_result = $api->get_order_by_id(order_id => $get_order_by_id_order_id);
 
 #
 # place_order test
 #
-{
-    my $order = undef; # replace NULL with a proper value
-    my $result = $api->place_order(order => $order);
-}
+# uncomment below and update the test
+#my $place_order_order = undef; # replace NULL with a proper value
+#my $place_order_result = $api->place_order(order => $place_order_order);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/StringBooleanMapTest.t b/samples/client/petstore/perl/t/StringBooleanMapTest.t
deleted file mode 100644
index ffcac0b77a05..000000000000
--- a/samples/client/petstore/perl/t/StringBooleanMapTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::StringBooleanMap');
-
-my $instance = WWW::OpenAPIClient::Object::StringBooleanMap->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::StringBooleanMap');
-
diff --git a/samples/client/petstore/perl/t/TagTest.t b/samples/client/petstore/perl/t/TagTest.t
index d9b862839fb2..1a5b2ee23aea 100644
--- a/samples/client/petstore/perl/t/TagTest.t
+++ b/samples/client/petstore/perl/t/TagTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::Tag');
 
-my $instance = WWW::OpenAPIClient::Object::Tag->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::Tag');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::Tag->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::Tag');
 
diff --git a/samples/client/petstore/perl/t/TypeHolderDefaultTest.t b/samples/client/petstore/perl/t/TypeHolderDefaultTest.t
deleted file mode 100644
index b1f70a2fe4ef..000000000000
--- a/samples/client/petstore/perl/t/TypeHolderDefaultTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::TypeHolderDefault');
-
-my $instance = WWW::OpenAPIClient::Object::TypeHolderDefault->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::TypeHolderDefault');
-
diff --git a/samples/client/petstore/perl/t/TypeHolderExampleTest.t b/samples/client/petstore/perl/t/TypeHolderExampleTest.t
deleted file mode 100644
index 4daf559c3e5f..000000000000
--- a/samples/client/petstore/perl/t/TypeHolderExampleTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::TypeHolderExample');
-
-my $instance = WWW::OpenAPIClient::Object::TypeHolderExample->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::TypeHolderExample');
-
diff --git a/samples/client/petstore/perl/t/UserApiTest.t b/samples/client/petstore/perl/t/UserApiTest.t
index eee42fb71d25..a79d1fc2570f 100644
--- a/samples/client/petstore/perl/t/UserApiTest.t
+++ b/samples/client/petstore/perl/t/UserApiTest.t
@@ -32,67 +32,57 @@ isa_ok($api, 'WWW::OpenAPIClient::UserApi');
 #
 # create_user test
 #
-{
-    my $user = undef; # replace NULL with a proper value
-    my $result = $api->create_user(user => $user);
-}
+# uncomment below and update the test
+#my $create_user_user = undef; # replace NULL with a proper value
+#my $create_user_result = $api->create_user(user => $create_user_user);
 
 #
 # create_users_with_array_input test
 #
-{
-    my $user = undef; # replace NULL with a proper value
-    my $result = $api->create_users_with_array_input(user => $user);
-}
+# uncomment below and update the test
+#my $create_users_with_array_input_user = undef; # replace NULL with a proper value
+#my $create_users_with_array_input_result = $api->create_users_with_array_input(user => $create_users_with_array_input_user);
 
 #
 # create_users_with_list_input test
 #
-{
-    my $user = undef; # replace NULL with a proper value
-    my $result = $api->create_users_with_list_input(user => $user);
-}
+# uncomment below and update the test
+#my $create_users_with_list_input_user = undef; # replace NULL with a proper value
+#my $create_users_with_list_input_result = $api->create_users_with_list_input(user => $create_users_with_list_input_user);
 
 #
 # delete_user test
 #
-{
-    my $username = undef; # replace NULL with a proper value
-    my $result = $api->delete_user(username => $username);
-}
+# uncomment below and update the test
+#my $delete_user_username = undef; # replace NULL with a proper value
+#my $delete_user_result = $api->delete_user(username => $delete_user_username);
 
 #
 # get_user_by_name test
 #
-{
-    my $username = undef; # replace NULL with a proper value
-    my $result = $api->get_user_by_name(username => $username);
-}
+# uncomment below and update the test
+#my $get_user_by_name_username = undef; # replace NULL with a proper value
+#my $get_user_by_name_result = $api->get_user_by_name(username => $get_user_by_name_username);
 
 #
 # login_user test
 #
-{
-    my $username = undef; # replace NULL with a proper value
-    my $password = undef; # replace NULL with a proper value
-    my $result = $api->login_user(username => $username, password => $password);
-}
+# uncomment below and update the test
+#my $login_user_username = undef; # replace NULL with a proper value
+#my $login_user_password = undef; # replace NULL with a proper value
+#my $login_user_result = $api->login_user(username => $login_user_username, password => $login_user_password);
 
 #
 # logout_user test
 #
-{
-    my $result = $api->logout_user();
-}
+# uncomment below and update the test
+#my $logout_user_result = $api->logout_user();
 
 #
 # update_user test
 #
-{
-    my $username = undef; # replace NULL with a proper value
-    my $user = undef; # replace NULL with a proper value
-    my $result = $api->update_user(username => $username, user => $user);
-}
+# uncomment below and update the test
+#my $update_user_username = undef; # replace NULL with a proper value
+#my $update_user_user = undef; # replace NULL with a proper value
+#my $update_user_result = $api->update_user(username => $update_user_username, user => $update_user_user);
 
-
-1;
diff --git a/samples/client/petstore/perl/t/UserTest.t b/samples/client/petstore/perl/t/UserTest.t
index eb95e9e23292..1e678b9efebd 100644
--- a/samples/client/petstore/perl/t/UserTest.t
+++ b/samples/client/petstore/perl/t/UserTest.t
@@ -27,7 +27,8 @@ use warnings;
 
 use_ok('WWW::OpenAPIClient::Object::User');
 
-my $instance = WWW::OpenAPIClient::Object::User->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::User');
+# uncomment below and update the test
+#my $instance = WWW::OpenAPIClient::Object::User->new();
+#
+#isa_ok($instance, 'WWW::OpenAPIClient::Object::User');
 
diff --git a/samples/client/petstore/perl/t/XmlItemTest.t b/samples/client/petstore/perl/t/XmlItemTest.t
deleted file mode 100644
index f60e4865f277..000000000000
--- a/samples/client/petstore/perl/t/XmlItemTest.t
+++ /dev/null
@@ -1,33 +0,0 @@
-=begin comment
-
-OpenAPI Petstore
-
-This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
-
-OpenAPI spec version: 1.0.0
-
-Generated by: https://openapi-generator.tech
-
-=end comment
-
-=cut
-
-#
-# NOTE: This class is auto generated by the OpenAPI Generator
-# Please update the test cases below to test the model.
-# Ref: https://openapi-generator.tech
-#
-use Test::More tests => 2;
-use Test::Exception;
-
-use lib 'lib';
-use strict;
-use warnings;
-
-
-use_ok('WWW::OpenAPIClient::Object::XmlItem');
-
-my $instance = WWW::OpenAPIClient::Object::XmlItem->new();
-
-isa_ok($instance, 'WWW::OpenAPIClient::Object::XmlItem');
-
diff --git a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
index dc5379a47ec2..fda1dc9138c5 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
+++ b/samples/client/petstore/php/OpenAPIClient-php/.openapi-generator/FILES
@@ -48,6 +48,7 @@ docs/Model/OuterEnum.md
 docs/Model/OuterEnumDefaultValue.md
 docs/Model/OuterEnumInteger.md
 docs/Model/OuterEnumIntegerDefaultValue.md
+docs/Model/OuterObjectWithEnumProperty.md
 docs/Model/Pet.md
 docs/Model/ReadOnlyFirst.md
 docs/Model/SpecialModelName.md
@@ -103,6 +104,7 @@ lib/Model/OuterEnum.php
 lib/Model/OuterEnumDefaultValue.php
 lib/Model/OuterEnumInteger.php
 lib/Model/OuterEnumIntegerDefaultValue.php
+lib/Model/OuterObjectWithEnumProperty.php
 lib/Model/Pet.php
 lib/Model/ReadOnlyFirst.php
 lib/Model/SpecialModelName.php
diff --git a/samples/client/petstore/php/OpenAPIClient-php/README.md b/samples/client/petstore/php/OpenAPIClient-php/README.md
index 88a572629bb3..2f4807ddee0b 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/README.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/README.md
@@ -79,6 +79,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterCompositeSerialize**](docs/Api/FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/Api/FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/Api/FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**fakePropertyEnumIntegerSerialize**](docs/Api/FakeApi.md#fakepropertyenumintegerserialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**testBodyWithFileSchema**](docs/Api/FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](docs/Api/FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](docs/Api/FakeApi.md#testclientmodel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -151,6 +152,7 @@ Class | Method | HTTP request | Description
 - [OuterEnumDefaultValue](docs/Model/OuterEnumDefaultValue.md)
 - [OuterEnumInteger](docs/Model/OuterEnumInteger.md)
 - [OuterEnumIntegerDefaultValue](docs/Model/OuterEnumIntegerDefaultValue.md)
+- [OuterObjectWithEnumProperty](docs/Model/OuterObjectWithEnumProperty.md)
 - [Pet](docs/Model/Pet.md)
 - [ReadOnlyFirst](docs/Model/ReadOnlyFirst.md)
 - [SpecialModelName](docs/Model/SpecialModelName.md)
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
index 30baf73838b0..4319d48a4083 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Api/FakeApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize()**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize()**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize()**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize()**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 [**testBodyWithFileSchema()**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams()**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel()**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -355,6 +356,62 @@ No authorization required
 [[Back to Model list]](../../README.md#models)
 [[Back to README]](../../README.md)
 
+## `fakePropertyEnumIntegerSerialize()`
+
+```php
+fakePropertyEnumIntegerSerialize($outer_object_with_enum_property): \OpenAPI\Client\Model\OuterObjectWithEnumProperty
+```
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example
+
+```php
+<?php
+require_once(__DIR__ . '/vendor/autoload.php');
+
+
+
+$apiInstance = new OpenAPI\Client\Api\FakeApi(
+    // If you want use custom http client, pass your client which implements `GuzzleHttp\ClientInterface`.
+    // This is optional, `GuzzleHttp\Client` will be used as default.
+    new GuzzleHttp\Client()
+);
+$outer_object_with_enum_property = new \OpenAPI\Client\Model\OuterObjectWithEnumProperty(); // \OpenAPI\Client\Model\OuterObjectWithEnumProperty | Input enum (int) as post body
+
+try {
+    $result = $apiInstance->fakePropertyEnumIntegerSerialize($outer_object_with_enum_property);
+    print_r($result);
+} catch (Exception $e) {
+    echo 'Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: ', $e->getMessage(), PHP_EOL;
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outer_object_with_enum_property** | [**\OpenAPI\Client\Model\OuterObjectWithEnumProperty**](../Model/OuterObjectWithEnumProperty.md)| Input enum (int) as post body |
+
+### Return type
+
+[**\OpenAPI\Client\Model\OuterObjectWithEnumProperty**](../Model/OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: `application/json`
+- **Accept**: `*/*`
+
+[[Back to top]](#) [[Back to API list]](../../README.md#endpoints)
+[[Back to Model list]](../../README.md#models)
+[[Back to README]](../../README.md)
+
 ## `testBodyWithFileSchema()`
 
 ```php
diff --git a/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterObjectWithEnumProperty.md b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..f2455a1972fb
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/docs/Model/OuterObjectWithEnumProperty.md
@@ -0,0 +1,9 @@
+# # OuterObjectWithEnumProperty
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**\OpenAPI\Client\Model\OuterEnumInteger**](OuterEnumInteger.md) |  |
+
+[[Back to Model list]](../../README.md#models) [[Back to API list]](../../README.md#endpoints) [[Back to README]](../../README.md)
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
index 6d2cdae7d858..831d28ac7a39 100644
--- a/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Api/FakeApi.php
@@ -1625,6 +1625,267 @@ class FakeApi
         );
     }
 
+    /**
+     * Operation fakePropertyEnumIntegerSerialize
+     *
+     * @param  \OpenAPI\Client\Model\OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+     *
+     * @throws \OpenAPI\Client\ApiException on non-2xx response
+     * @throws \InvalidArgumentException
+     * @return \OpenAPI\Client\Model\OuterObjectWithEnumProperty
+     */
+    public function fakePropertyEnumIntegerSerialize($outer_object_with_enum_property)
+    {
+        list($response) = $this->fakePropertyEnumIntegerSerializeWithHttpInfo($outer_object_with_enum_property);
+        return $response;
+    }
+
+    /**
+     * Operation fakePropertyEnumIntegerSerializeWithHttpInfo
+     *
+     * @param  \OpenAPI\Client\Model\OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+     *
+     * @throws \OpenAPI\Client\ApiException on non-2xx response
+     * @throws \InvalidArgumentException
+     * @return array of \OpenAPI\Client\Model\OuterObjectWithEnumProperty, HTTP status code, HTTP response headers (array of strings)
+     */
+    public function fakePropertyEnumIntegerSerializeWithHttpInfo($outer_object_with_enum_property)
+    {
+        $request = $this->fakePropertyEnumIntegerSerializeRequest($outer_object_with_enum_property);
+
+        try {
+            $options = $this->createHttpClientOption();
+            try {
+                $response = $this->client->send($request, $options);
+            } catch (RequestException $e) {
+                throw new ApiException(
+                    "[{$e->getCode()}] {$e->getMessage()}",
+                    $e->getCode(),
+                    $e->getResponse() ? $e->getResponse()->getHeaders() : null,
+                    $e->getResponse() ? (string) $e->getResponse()->getBody() : null
+                );
+            }
+
+            $statusCode = $response->getStatusCode();
+
+            if ($statusCode < 200 || $statusCode > 299) {
+                throw new ApiException(
+                    sprintf(
+                        '[%d] Error connecting to the API (%s)',
+                        $statusCode,
+                        $request->getUri()
+                    ),
+                    $statusCode,
+                    $response->getHeaders(),
+                    $response->getBody()
+                );
+            }
+
+            $responseBody = $response->getBody();
+            switch($statusCode) {
+                case 200:
+                    if ('\OpenAPI\Client\Model\OuterObjectWithEnumProperty' === '\SplFileObject') {
+                        $content = $responseBody; //stream goes to serializer
+                    } else {
+                        $content = (string) $responseBody;
+                    }
+
+                    return [
+                        ObjectSerializer::deserialize($content, '\OpenAPI\Client\Model\OuterObjectWithEnumProperty', []),
+                        $response->getStatusCode(),
+                        $response->getHeaders()
+                    ];
+            }
+
+            $returnType = '\OpenAPI\Client\Model\OuterObjectWithEnumProperty';
+            $responseBody = $response->getBody();
+            if ($returnType === '\SplFileObject') {
+                $content = $responseBody; //stream goes to serializer
+            } else {
+                $content = (string) $responseBody;
+            }
+
+            return [
+                ObjectSerializer::deserialize($content, $returnType, []),
+                $response->getStatusCode(),
+                $response->getHeaders()
+            ];
+
+        } catch (ApiException $e) {
+            switch ($e->getCode()) {
+                case 200:
+                    $data = ObjectSerializer::deserialize(
+                        $e->getResponseBody(),
+                        '\OpenAPI\Client\Model\OuterObjectWithEnumProperty',
+                        $e->getResponseHeaders()
+                    );
+                    $e->setResponseObject($data);
+                    break;
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * Operation fakePropertyEnumIntegerSerializeAsync
+     *
+     * 
+     *
+     * @param  \OpenAPI\Client\Model\OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Promise\PromiseInterface
+     */
+    public function fakePropertyEnumIntegerSerializeAsync($outer_object_with_enum_property)
+    {
+        return $this->fakePropertyEnumIntegerSerializeAsyncWithHttpInfo($outer_object_with_enum_property)
+            ->then(
+                function ($response) {
+                    return $response[0];
+                }
+            );
+    }
+
+    /**
+     * Operation fakePropertyEnumIntegerSerializeAsyncWithHttpInfo
+     *
+     * 
+     *
+     * @param  \OpenAPI\Client\Model\OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Promise\PromiseInterface
+     */
+    public function fakePropertyEnumIntegerSerializeAsyncWithHttpInfo($outer_object_with_enum_property)
+    {
+        $returnType = '\OpenAPI\Client\Model\OuterObjectWithEnumProperty';
+        $request = $this->fakePropertyEnumIntegerSerializeRequest($outer_object_with_enum_property);
+
+        return $this->client
+            ->sendAsync($request, $this->createHttpClientOption())
+            ->then(
+                function ($response) use ($returnType) {
+                    $responseBody = $response->getBody();
+                    if ($returnType === '\SplFileObject') {
+                        $content = $responseBody; //stream goes to serializer
+                    } else {
+                        $content = (string) $responseBody;
+                    }
+
+                    return [
+                        ObjectSerializer::deserialize($content, $returnType, []),
+                        $response->getStatusCode(),
+                        $response->getHeaders()
+                    ];
+                },
+                function ($exception) {
+                    $response = $exception->getResponse();
+                    $statusCode = $response->getStatusCode();
+                    throw new ApiException(
+                        sprintf(
+                            '[%d] Error connecting to the API (%s)',
+                            $statusCode,
+                            $exception->getRequest()->getUri()
+                        ),
+                        $statusCode,
+                        $response->getHeaders(),
+                        $response->getBody()
+                    );
+                }
+            );
+    }
+
+    /**
+     * Create request for operation 'fakePropertyEnumIntegerSerialize'
+     *
+     * @param  \OpenAPI\Client\Model\OuterObjectWithEnumProperty $outer_object_with_enum_property Input enum (int) as post body (required)
+     *
+     * @throws \InvalidArgumentException
+     * @return \GuzzleHttp\Psr7\Request
+     */
+    public function fakePropertyEnumIntegerSerializeRequest($outer_object_with_enum_property)
+    {
+        // verify the required parameter 'outer_object_with_enum_property' is set
+        if ($outer_object_with_enum_property === null || (is_array($outer_object_with_enum_property) && count($outer_object_with_enum_property) === 0)) {
+            throw new \InvalidArgumentException(
+                'Missing the required parameter $outer_object_with_enum_property when calling fakePropertyEnumIntegerSerialize'
+            );
+        }
+
+        $resourcePath = '/fake/property/enum-int';
+        $formParams = [];
+        $queryParams = [];
+        $headerParams = [];
+        $httpBody = '';
+        $multipart = false;
+
+
+
+
+
+        if ($multipart) {
+            $headers = $this->headerSelector->selectHeadersForMultipart(
+                ['*/*']
+            );
+        } else {
+            $headers = $this->headerSelector->selectHeaders(
+                ['*/*'],
+                ['application/json']
+            );
+        }
+
+        // for model (json/xml)
+        if (isset($outer_object_with_enum_property)) {
+            if ($headers['Content-Type'] === 'application/json') {
+                $httpBody = \GuzzleHttp\json_encode(ObjectSerializer::sanitizeForSerialization($outer_object_with_enum_property));
+            } else {
+                $httpBody = $outer_object_with_enum_property;
+            }
+        } elseif (count($formParams) > 0) {
+            if ($multipart) {
+                $multipartContents = [];
+                foreach ($formParams as $formParamName => $formParamValue) {
+                    $formParamValueItems = is_array($formParamValue) ? $formParamValue : [$formParamValue];
+                    foreach ($formParamValueItems as $formParamValueItem) {
+                        $multipartContents[] = [
+                            'name' => $formParamName,
+                            'contents' => $formParamValueItem
+                        ];
+                    }
+                }
+                // for HTTP post (form)
+                $httpBody = new MultipartStream($multipartContents);
+
+            } elseif ($headers['Content-Type'] === 'application/json') {
+                $httpBody = \GuzzleHttp\json_encode($formParams);
+
+            } else {
+                // for HTTP post (form)
+                $httpBody = \GuzzleHttp\Psr7\build_query($formParams);
+            }
+        }
+
+
+        $defaultHeaders = [];
+        if ($this->config->getUserAgent()) {
+            $defaultHeaders['User-Agent'] = $this->config->getUserAgent();
+        }
+
+        $headers = array_merge(
+            $defaultHeaders,
+            $headerParams,
+            $headers
+        );
+
+        $query = \GuzzleHttp\Psr7\build_query($queryParams);
+        return new Request(
+            'POST',
+            $this->config->getHost() . $resourcePath . ($query ? "?{$query}" : ''),
+            $headers,
+            $httpBody
+        );
+    }
+
     /**
      * Operation testBodyWithFileSchema
      *
diff --git a/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php
new file mode 100644
index 000000000000..f735350238cf
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/lib/Model/OuterObjectWithEnumProperty.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * OuterObjectWithEnumProperty
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.1.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+namespace OpenAPI\Client\Model;
+
+use \ArrayAccess;
+use \OpenAPI\Client\ObjectSerializer;
+
+/**
+ * OuterObjectWithEnumProperty Class Doc Comment
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ * @implements \ArrayAccess<TKey, TValue>
+ * @template TKey int|null
+ * @template TValue mixed|null  
+ */
+class OuterObjectWithEnumProperty implements ModelInterface, ArrayAccess, \JsonSerializable
+{
+    public const DISCRIMINATOR = null;
+
+    /**
+      * The original name of the model.
+      *
+      * @var string
+      */
+    protected static $openAPIModelName = 'OuterObjectWithEnumProperty';
+
+    /**
+      * Array of property to type mappings. Used for (de)serialization
+      *
+      * @var string[]
+      */
+    protected static $openAPITypes = [
+        'value' => '\OpenAPI\Client\Model\OuterEnumInteger'
+    ];
+
+    /**
+      * Array of property to format mappings. Used for (de)serialization
+      *
+      * @var string[]
+      * @phpstan-var array<string, string|null>
+      * @psalm-var array<string, string|null>
+      */
+    protected static $openAPIFormats = [
+        'value' => null
+    ];
+
+    /**
+     * Array of property to type mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPITypes()
+    {
+        return self::$openAPITypes;
+    }
+
+    /**
+     * Array of property to format mappings. Used for (de)serialization
+     *
+     * @return array
+     */
+    public static function openAPIFormats()
+    {
+        return self::$openAPIFormats;
+    }
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @var string[]
+     */
+    protected static $attributeMap = [
+        'value' => 'value'
+    ];
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @var string[]
+     */
+    protected static $setters = [
+        'value' => 'setValue'
+    ];
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @var string[]
+     */
+    protected static $getters = [
+        'value' => 'getValue'
+    ];
+
+    /**
+     * Array of attributes where the key is the local name,
+     * and the value is the original name
+     *
+     * @return array
+     */
+    public static function attributeMap()
+    {
+        return self::$attributeMap;
+    }
+
+    /**
+     * Array of attributes to setter functions (for deserialization of responses)
+     *
+     * @return array
+     */
+    public static function setters()
+    {
+        return self::$setters;
+    }
+
+    /**
+     * Array of attributes to getter functions (for serialization of requests)
+     *
+     * @return array
+     */
+    public static function getters()
+    {
+        return self::$getters;
+    }
+
+    /**
+     * The original name of the model.
+     *
+     * @return string
+     */
+    public function getModelName()
+    {
+        return self::$openAPIModelName;
+    }
+
+    
+
+    
+
+    /**
+     * Associative array for storing property values
+     *
+     * @var mixed[]
+     */
+    protected $container = [];
+
+    /**
+     * Constructor
+     *
+     * @param mixed[] $data Associated array of property values
+     *                      initializing the model
+     */
+    public function __construct(array $data = null)
+    {
+        $this->container['value'] = $data['value'] ?? null;
+    }
+
+    /**
+     * Show all the invalid properties with reasons.
+     *
+     * @return array invalid properties with reasons
+     */
+    public function listInvalidProperties()
+    {
+        $invalidProperties = [];
+
+        if ($this->container['value'] === null) {
+            $invalidProperties[] = "'value' can't be null";
+        }
+        return $invalidProperties;
+    }
+
+    /**
+     * Validate all the properties in the model
+     * return true if all passed
+     *
+     * @return bool True if all properties are valid
+     */
+    public function valid()
+    {
+        return count($this->listInvalidProperties()) === 0;
+    }
+
+
+    /**
+     * Gets value
+     *
+     * @return \OpenAPI\Client\Model\OuterEnumInteger
+     */
+    public function getValue()
+    {
+        return $this->container['value'];
+    }
+
+    /**
+     * Sets value
+     *
+     * @param \OpenAPI\Client\Model\OuterEnumInteger $value value
+     *
+     * @return self
+     */
+    public function setValue($value)
+    {
+        $this->container['value'] = $value;
+
+        return $this;
+    }
+    /**
+     * Returns true if offset exists. False otherwise.
+     *
+     * @param integer $offset Offset
+     *
+     * @return boolean
+     */
+    public function offsetExists($offset)
+    {
+        return isset($this->container[$offset]);
+    }
+
+    /**
+     * Gets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return mixed|null
+     */
+    public function offsetGet($offset)
+    {
+        return $this->container[$offset] ?? null;
+    }
+
+    /**
+     * Sets value based on offset.
+     *
+     * @param int|null $offset Offset
+     * @param mixed    $value  Value to be set
+     *
+     * @return void
+     */
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->container[] = $value;
+        } else {
+            $this->container[$offset] = $value;
+        }
+    }
+
+    /**
+     * Unsets offset.
+     *
+     * @param integer $offset Offset
+     *
+     * @return void
+     */
+    public function offsetUnset($offset)
+    {
+        unset($this->container[$offset]);
+    }
+
+    /**
+     * Serializes the object to a value that can be serialized natively by json_encode().
+     * @link https://www.php.net/manual/en/jsonserializable.jsonserialize.php
+     *
+     * @return mixed Returns data which can be serialized by json_encode(), which is a value
+     * of any type other than a resource.
+     */
+    public function jsonSerialize()
+    {
+       return ObjectSerializer::sanitizeForSerialization($this);
+    }
+
+    /**
+     * Gets the string presentation of the object
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return json_encode(
+            ObjectSerializer::sanitizeForSerialization($this),
+            JSON_PRETTY_PRINT
+        );
+    }
+
+    /**
+     * Gets a header-safe presentation of the object
+     *
+     * @return string
+     */
+    public function toHeaderValue()
+    {
+        return json_encode(ObjectSerializer::sanitizeForSerialization($this));
+    }
+}
+
+
diff --git a/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php
new file mode 100644
index 000000000000..9b186f93f6c3
--- /dev/null
+++ b/samples/client/petstore/php/OpenAPIClient-php/test/Model/OuterObjectWithEnumPropertyTest.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * OuterObjectWithEnumPropertyTest
+ *
+ * PHP version 7.2
+ *
+ * @category Class
+ * @package  OpenAPI\Client
+ * @author   OpenAPI Generator team
+ * @link     https://openapi-generator.tech
+ */
+
+/**
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ * Generated by: https://openapi-generator.tech
+ * OpenAPI Generator version: 5.1.0-SNAPSHOT
+ */
+
+/**
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Please update the test case below to test the model.
+ */
+
+namespace OpenAPI\Client\Test\Model;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * OuterObjectWithEnumPropertyTest Class Doc Comment
+ *
+ * @category    Class
+ * @description OuterObjectWithEnumProperty
+ * @package     OpenAPI\Client
+ * @author      OpenAPI Generator team
+ * @link        https://openapi-generator.tech
+ */
+class OuterObjectWithEnumPropertyTest extends TestCase
+{
+
+    /**
+     * Setup before running any test case
+     */
+    public static function setUpBeforeClass(): void
+    {
+    }
+
+    /**
+     * Setup before running each test case
+     */
+    public function setUp(): void
+    {
+    }
+
+    /**
+     * Clean up after running each test case
+     */
+    public function tearDown(): void
+    {
+    }
+
+    /**
+     * Clean up after running all test cases
+     */
+    public static function tearDownAfterClass(): void
+    {
+    }
+
+    /**
+     * Test "OuterObjectWithEnumProperty"
+     */
+    public function testOuterObjectWithEnumProperty()
+    {
+        // TODO: implement
+        $this->markTestIncomplete('Not implemented');
+    }
+
+    /**
+     * Test attribute "value"
+     */
+    public function testPropertyValue()
+    {
+        // TODO: implement
+        $this->markTestIncomplete('Not implemented');
+    }
+}
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesAnyType.md
index 9843d35ab906..6d5625857d5e 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesAnyType.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesArray.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesArray.md
index cfe09d91c726..934c43272a94 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesArray.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesArray
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesBoolean.md
index 74f009554a7f..577b141d4703 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesBoolean.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
index eb3e0524de1a..7e5025e58ce2 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesInteger.md
index a3e58fd1b0bd..4a5e49e0b020 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesInteger.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesInteger
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesNumber.md
index 37eafe1ff031..39a8992fd4a6 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesNumber.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesNumber
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesObject.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesObject.md
index 7f4d6713c758..ec590e3cf96f 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesObject.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesObject
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesString.md b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesString.md
index 9317cfeee80b..c7cc62130506 100644
--- a/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/python-asyncio/docs/AdditionalPropertiesString.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesString
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Animal.md b/samples/client/petstore/python-asyncio/docs/Animal.md
index 7ed4ba541fa3..8bc43ab53f33 100644
--- a/samples/client/petstore/python-asyncio/docs/Animal.md
+++ b/samples/client/petstore/python-asyncio/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ApiResponse.md b/samples/client/petstore/python-asyncio/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100644
--- a/samples/client/petstore/python-asyncio/docs/ApiResponse.md
+++ b/samples/client/petstore/python-asyncio/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/python-asyncio/docs/ArrayOfArrayOfNumberOnly.md
index aa3988ab1679..b53b6cdb8c46 100644
--- a/samples/client/petstore/python-asyncio/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-asyncio/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ArrayOfNumberOnly.md b/samples/client/petstore/python-asyncio/docs/ArrayOfNumberOnly.md
index 2c3de967aec6..6116bc7489fd 100644
--- a/samples/client/petstore/python-asyncio/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-asyncio/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ArrayTest.md b/samples/client/petstore/python-asyncio/docs/ArrayTest.md
index 6ab0d1378065..81420a3b9bbb 100644
--- a/samples/client/petstore/python-asyncio/docs/ArrayTest.md
+++ b/samples/client/petstore/python-asyncio/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/BigCat.md b/samples/client/petstore/python-asyncio/docs/BigCat.md
index 000271f832af..d26809fcff80 100644
--- a/samples/client/petstore/python-asyncio/docs/BigCat.md
+++ b/samples/client/petstore/python-asyncio/docs/BigCat.md
@@ -1,5 +1,6 @@
 # BigCat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/BigCatAllOf.md b/samples/client/petstore/python-asyncio/docs/BigCatAllOf.md
index 621bda6d35a2..c3c42f41da55 100644
--- a/samples/client/petstore/python-asyncio/docs/BigCatAllOf.md
+++ b/samples/client/petstore/python-asyncio/docs/BigCatAllOf.md
@@ -1,5 +1,6 @@
 # BigCatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Capitalization.md b/samples/client/petstore/python-asyncio/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100644
--- a/samples/client/petstore/python-asyncio/docs/Capitalization.md
+++ b/samples/client/petstore/python-asyncio/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Cat.md b/samples/client/petstore/python-asyncio/docs/Cat.md
index 8d30565d014e..b3eff72b3095 100644
--- a/samples/client/petstore/python-asyncio/docs/Cat.md
+++ b/samples/client/petstore/python-asyncio/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/CatAllOf.md b/samples/client/petstore/python-asyncio/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100644
--- a/samples/client/petstore/python-asyncio/docs/CatAllOf.md
+++ b/samples/client/petstore/python-asyncio/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Category.md b/samples/client/petstore/python-asyncio/docs/Category.md
index 7e5c1e316499..095459c80b65 100644
--- a/samples/client/petstore/python-asyncio/docs/Category.md
+++ b/samples/client/petstore/python-asyncio/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ClassModel.md b/samples/client/petstore/python-asyncio/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100644
--- a/samples/client/petstore/python-asyncio/docs/ClassModel.md
+++ b/samples/client/petstore/python-asyncio/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Client.md b/samples/client/petstore/python-asyncio/docs/Client.md
index 88e99384f92c..c3986008d6c3 100644
--- a/samples/client/petstore/python-asyncio/docs/Client.md
+++ b/samples/client/petstore/python-asyncio/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Dog.md b/samples/client/petstore/python-asyncio/docs/Dog.md
index f727487975c4..7eeaf5b68515 100644
--- a/samples/client/petstore/python-asyncio/docs/Dog.md
+++ b/samples/client/petstore/python-asyncio/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/DogAllOf.md b/samples/client/petstore/python-asyncio/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100644
--- a/samples/client/petstore/python-asyncio/docs/DogAllOf.md
+++ b/samples/client/petstore/python-asyncio/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/EnumArrays.md b/samples/client/petstore/python-asyncio/docs/EnumArrays.md
index e15a5f1fd049..92de0e955650 100644
--- a/samples/client/petstore/python-asyncio/docs/EnumArrays.md
+++ b/samples/client/petstore/python-asyncio/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/EnumClass.md b/samples/client/petstore/python-asyncio/docs/EnumClass.md
index 67f017becd0c..64830e3d1dee 100644
--- a/samples/client/petstore/python-asyncio/docs/EnumClass.md
+++ b/samples/client/petstore/python-asyncio/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/EnumTest.md b/samples/client/petstore/python-asyncio/docs/EnumTest.md
index c4c1630250ff..1911bfa918cd 100644
--- a/samples/client/petstore/python-asyncio/docs/EnumTest.md
+++ b/samples/client/petstore/python-asyncio/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/File.md b/samples/client/petstore/python-asyncio/docs/File.md
index f17ba0057d04..63b1d1a65186 100644
--- a/samples/client/petstore/python-asyncio/docs/File.md
+++ b/samples/client/petstore/python-asyncio/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/FileSchemaTestClass.md b/samples/client/petstore/python-asyncio/docs/FileSchemaTestClass.md
index dc3722289887..58d71b7a26be 100644
--- a/samples/client/petstore/python-asyncio/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/python-asyncio/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/FormatTest.md b/samples/client/petstore/python-asyncio/docs/FormatTest.md
index f0942f52484f..239b60134ab5 100644
--- a/samples/client/petstore/python-asyncio/docs/FormatTest.md
+++ b/samples/client/petstore/python-asyncio/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/HasOnlyReadOnly.md b/samples/client/petstore/python-asyncio/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100644
--- a/samples/client/petstore/python-asyncio/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/python-asyncio/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/List.md b/samples/client/petstore/python-asyncio/docs/List.md
index 11f4f3a05f32..4b60956971aa 100644
--- a/samples/client/petstore/python-asyncio/docs/List.md
+++ b/samples/client/petstore/python-asyncio/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/MapTest.md b/samples/client/petstore/python-asyncio/docs/MapTest.md
index a5601691f885..aea74bc8689c 100644
--- a/samples/client/petstore/python-asyncio/docs/MapTest.md
+++ b/samples/client/petstore/python-asyncio/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python-asyncio/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index b9808d5275e5..53e84e839bbb 100644
--- a/samples/client/petstore/python-asyncio/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-asyncio/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Model200Response.md b/samples/client/petstore/python-asyncio/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100644
--- a/samples/client/petstore/python-asyncio/docs/Model200Response.md
+++ b/samples/client/petstore/python-asyncio/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ModelReturn.md b/samples/client/petstore/python-asyncio/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100644
--- a/samples/client/petstore/python-asyncio/docs/ModelReturn.md
+++ b/samples/client/petstore/python-asyncio/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Name.md b/samples/client/petstore/python-asyncio/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100644
--- a/samples/client/petstore/python-asyncio/docs/Name.md
+++ b/samples/client/petstore/python-asyncio/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/NumberOnly.md b/samples/client/petstore/python-asyncio/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100644
--- a/samples/client/petstore/python-asyncio/docs/NumberOnly.md
+++ b/samples/client/petstore/python-asyncio/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Order.md b/samples/client/petstore/python-asyncio/docs/Order.md
index b5f7b22d34cf..f360fffe8149 100644
--- a/samples/client/petstore/python-asyncio/docs/Order.md
+++ b/samples/client/petstore/python-asyncio/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/OuterComposite.md b/samples/client/petstore/python-asyncio/docs/OuterComposite.md
index bab07ad559eb..31013673df73 100644
--- a/samples/client/petstore/python-asyncio/docs/OuterComposite.md
+++ b/samples/client/petstore/python-asyncio/docs/OuterComposite.md
@@ -1,5 +1,6 @@
 # OuterComposite
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/OuterEnum.md b/samples/client/petstore/python-asyncio/docs/OuterEnum.md
index 06d413b01680..4cb31437c7e2 100644
--- a/samples/client/petstore/python-asyncio/docs/OuterEnum.md
+++ b/samples/client/petstore/python-asyncio/docs/OuterEnum.md
@@ -1,5 +1,6 @@
 # OuterEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Pet.md b/samples/client/petstore/python-asyncio/docs/Pet.md
index 9e15090300f8..c462e794c89a 100644
--- a/samples/client/petstore/python-asyncio/docs/Pet.md
+++ b/samples/client/petstore/python-asyncio/docs/Pet.md
@@ -1,5 +1,6 @@
 # Pet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/ReadOnlyFirst.md b/samples/client/petstore/python-asyncio/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100644
--- a/samples/client/petstore/python-asyncio/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/python-asyncio/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/SpecialModelName.md b/samples/client/petstore/python-asyncio/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100644
--- a/samples/client/petstore/python-asyncio/docs/SpecialModelName.md
+++ b/samples/client/petstore/python-asyncio/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/Tag.md b/samples/client/petstore/python-asyncio/docs/Tag.md
index 243cd98eda69..4ccac4949afc 100644
--- a/samples/client/petstore/python-asyncio/docs/Tag.md
+++ b/samples/client/petstore/python-asyncio/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/TypeHolderDefault.md b/samples/client/petstore/python-asyncio/docs/TypeHolderDefault.md
index 861da021826a..13d283006304 100644
--- a/samples/client/petstore/python-asyncio/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/python-asyncio/docs/TypeHolderDefault.md
@@ -1,5 +1,6 @@
 # TypeHolderDefault
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/TypeHolderExample.md b/samples/client/petstore/python-asyncio/docs/TypeHolderExample.md
index 2a410ded8e35..f75bdd36f647 100644
--- a/samples/client/petstore/python-asyncio/docs/TypeHolderExample.md
+++ b/samples/client/petstore/python-asyncio/docs/TypeHolderExample.md
@@ -1,5 +1,6 @@
 # TypeHolderExample
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/User.md b/samples/client/petstore/python-asyncio/docs/User.md
index 443ac123fdca..b0079f591b6e 100644
--- a/samples/client/petstore/python-asyncio/docs/User.md
+++ b/samples/client/petstore/python-asyncio/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-asyncio/docs/XmlItem.md b/samples/client/petstore/python-asyncio/docs/XmlItem.md
index 3dd09833fe52..acaadbdb5f78 100644
--- a/samples/client/petstore/python-asyncio/docs/XmlItem.md
+++ b/samples/client/petstore/python-asyncio/docs/XmlItem.md
@@ -1,5 +1,6 @@
 # XmlItem
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesAnyType.md
index 9843d35ab906..6d5625857d5e 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesAnyType.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesArray.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesArray.md
index cfe09d91c726..934c43272a94 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesArray.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesArray
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesBoolean.md
index 74f009554a7f..577b141d4703 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesBoolean.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
index eb3e0524de1a..7e5025e58ce2 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesInteger.md
index a3e58fd1b0bd..4a5e49e0b020 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesInteger.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesInteger
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesNumber.md
index 37eafe1ff031..39a8992fd4a6 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesNumber.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesNumber
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesObject.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesObject.md
index 7f4d6713c758..ec590e3cf96f 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesObject.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesObject
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesString.md b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesString.md
index 9317cfeee80b..c7cc62130506 100644
--- a/samples/client/petstore/python-legacy/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/python-legacy/docs/AdditionalPropertiesString.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesString
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Animal.md b/samples/client/petstore/python-legacy/docs/Animal.md
index 7ed4ba541fa3..8bc43ab53f33 100644
--- a/samples/client/petstore/python-legacy/docs/Animal.md
+++ b/samples/client/petstore/python-legacy/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ApiResponse.md b/samples/client/petstore/python-legacy/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100644
--- a/samples/client/petstore/python-legacy/docs/ApiResponse.md
+++ b/samples/client/petstore/python-legacy/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
index aa3988ab1679..b53b6cdb8c46 100644
--- a/samples/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md b/samples/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
index 2c3de967aec6..6116bc7489fd 100644
--- a/samples/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ArrayTest.md b/samples/client/petstore/python-legacy/docs/ArrayTest.md
index 6ab0d1378065..81420a3b9bbb 100644
--- a/samples/client/petstore/python-legacy/docs/ArrayTest.md
+++ b/samples/client/petstore/python-legacy/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/BigCat.md b/samples/client/petstore/python-legacy/docs/BigCat.md
index 000271f832af..d26809fcff80 100644
--- a/samples/client/petstore/python-legacy/docs/BigCat.md
+++ b/samples/client/petstore/python-legacy/docs/BigCat.md
@@ -1,5 +1,6 @@
 # BigCat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/BigCatAllOf.md b/samples/client/petstore/python-legacy/docs/BigCatAllOf.md
index 621bda6d35a2..c3c42f41da55 100644
--- a/samples/client/petstore/python-legacy/docs/BigCatAllOf.md
+++ b/samples/client/petstore/python-legacy/docs/BigCatAllOf.md
@@ -1,5 +1,6 @@
 # BigCatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Capitalization.md b/samples/client/petstore/python-legacy/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100644
--- a/samples/client/petstore/python-legacy/docs/Capitalization.md
+++ b/samples/client/petstore/python-legacy/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Cat.md b/samples/client/petstore/python-legacy/docs/Cat.md
index 8d30565d014e..b3eff72b3095 100644
--- a/samples/client/petstore/python-legacy/docs/Cat.md
+++ b/samples/client/petstore/python-legacy/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/CatAllOf.md b/samples/client/petstore/python-legacy/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100644
--- a/samples/client/petstore/python-legacy/docs/CatAllOf.md
+++ b/samples/client/petstore/python-legacy/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Category.md b/samples/client/petstore/python-legacy/docs/Category.md
index 7e5c1e316499..095459c80b65 100644
--- a/samples/client/petstore/python-legacy/docs/Category.md
+++ b/samples/client/petstore/python-legacy/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ClassModel.md b/samples/client/petstore/python-legacy/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100644
--- a/samples/client/petstore/python-legacy/docs/ClassModel.md
+++ b/samples/client/petstore/python-legacy/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Client.md b/samples/client/petstore/python-legacy/docs/Client.md
index 88e99384f92c..c3986008d6c3 100644
--- a/samples/client/petstore/python-legacy/docs/Client.md
+++ b/samples/client/petstore/python-legacy/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Dog.md b/samples/client/petstore/python-legacy/docs/Dog.md
index f727487975c4..7eeaf5b68515 100644
--- a/samples/client/petstore/python-legacy/docs/Dog.md
+++ b/samples/client/petstore/python-legacy/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/DogAllOf.md b/samples/client/petstore/python-legacy/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100644
--- a/samples/client/petstore/python-legacy/docs/DogAllOf.md
+++ b/samples/client/petstore/python-legacy/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/EnumArrays.md b/samples/client/petstore/python-legacy/docs/EnumArrays.md
index e15a5f1fd049..92de0e955650 100644
--- a/samples/client/petstore/python-legacy/docs/EnumArrays.md
+++ b/samples/client/petstore/python-legacy/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/EnumClass.md b/samples/client/petstore/python-legacy/docs/EnumClass.md
index 67f017becd0c..64830e3d1dee 100644
--- a/samples/client/petstore/python-legacy/docs/EnumClass.md
+++ b/samples/client/petstore/python-legacy/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/EnumTest.md b/samples/client/petstore/python-legacy/docs/EnumTest.md
index c4c1630250ff..1911bfa918cd 100644
--- a/samples/client/petstore/python-legacy/docs/EnumTest.md
+++ b/samples/client/petstore/python-legacy/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/File.md b/samples/client/petstore/python-legacy/docs/File.md
index f17ba0057d04..63b1d1a65186 100644
--- a/samples/client/petstore/python-legacy/docs/File.md
+++ b/samples/client/petstore/python-legacy/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/FileSchemaTestClass.md b/samples/client/petstore/python-legacy/docs/FileSchemaTestClass.md
index dc3722289887..58d71b7a26be 100644
--- a/samples/client/petstore/python-legacy/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/python-legacy/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/FormatTest.md b/samples/client/petstore/python-legacy/docs/FormatTest.md
index f0942f52484f..239b60134ab5 100644
--- a/samples/client/petstore/python-legacy/docs/FormatTest.md
+++ b/samples/client/petstore/python-legacy/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/HasOnlyReadOnly.md b/samples/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100644
--- a/samples/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/List.md b/samples/client/petstore/python-legacy/docs/List.md
index 11f4f3a05f32..4b60956971aa 100644
--- a/samples/client/petstore/python-legacy/docs/List.md
+++ b/samples/client/petstore/python-legacy/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/MapTest.md b/samples/client/petstore/python-legacy/docs/MapTest.md
index a5601691f885..aea74bc8689c 100644
--- a/samples/client/petstore/python-legacy/docs/MapTest.md
+++ b/samples/client/petstore/python-legacy/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index b9808d5275e5..53e84e839bbb 100644
--- a/samples/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Model200Response.md b/samples/client/petstore/python-legacy/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100644
--- a/samples/client/petstore/python-legacy/docs/Model200Response.md
+++ b/samples/client/petstore/python-legacy/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ModelReturn.md b/samples/client/petstore/python-legacy/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100644
--- a/samples/client/petstore/python-legacy/docs/ModelReturn.md
+++ b/samples/client/petstore/python-legacy/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Name.md b/samples/client/petstore/python-legacy/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100644
--- a/samples/client/petstore/python-legacy/docs/Name.md
+++ b/samples/client/petstore/python-legacy/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/NumberOnly.md b/samples/client/petstore/python-legacy/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100644
--- a/samples/client/petstore/python-legacy/docs/NumberOnly.md
+++ b/samples/client/petstore/python-legacy/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Order.md b/samples/client/petstore/python-legacy/docs/Order.md
index b5f7b22d34cf..f360fffe8149 100644
--- a/samples/client/petstore/python-legacy/docs/Order.md
+++ b/samples/client/petstore/python-legacy/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/OuterComposite.md b/samples/client/petstore/python-legacy/docs/OuterComposite.md
index bab07ad559eb..31013673df73 100644
--- a/samples/client/petstore/python-legacy/docs/OuterComposite.md
+++ b/samples/client/petstore/python-legacy/docs/OuterComposite.md
@@ -1,5 +1,6 @@
 # OuterComposite
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/OuterEnum.md b/samples/client/petstore/python-legacy/docs/OuterEnum.md
index 06d413b01680..4cb31437c7e2 100644
--- a/samples/client/petstore/python-legacy/docs/OuterEnum.md
+++ b/samples/client/petstore/python-legacy/docs/OuterEnum.md
@@ -1,5 +1,6 @@
 # OuterEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Pet.md b/samples/client/petstore/python-legacy/docs/Pet.md
index 9e15090300f8..c462e794c89a 100644
--- a/samples/client/petstore/python-legacy/docs/Pet.md
+++ b/samples/client/petstore/python-legacy/docs/Pet.md
@@ -1,5 +1,6 @@
 # Pet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/ReadOnlyFirst.md b/samples/client/petstore/python-legacy/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100644
--- a/samples/client/petstore/python-legacy/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/python-legacy/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/SpecialModelName.md b/samples/client/petstore/python-legacy/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100644
--- a/samples/client/petstore/python-legacy/docs/SpecialModelName.md
+++ b/samples/client/petstore/python-legacy/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/Tag.md b/samples/client/petstore/python-legacy/docs/Tag.md
index 243cd98eda69..4ccac4949afc 100644
--- a/samples/client/petstore/python-legacy/docs/Tag.md
+++ b/samples/client/petstore/python-legacy/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/TypeHolderDefault.md b/samples/client/petstore/python-legacy/docs/TypeHolderDefault.md
index 861da021826a..13d283006304 100644
--- a/samples/client/petstore/python-legacy/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/python-legacy/docs/TypeHolderDefault.md
@@ -1,5 +1,6 @@
 # TypeHolderDefault
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/TypeHolderExample.md b/samples/client/petstore/python-legacy/docs/TypeHolderExample.md
index 2a410ded8e35..f75bdd36f647 100644
--- a/samples/client/petstore/python-legacy/docs/TypeHolderExample.md
+++ b/samples/client/petstore/python-legacy/docs/TypeHolderExample.md
@@ -1,5 +1,6 @@
 # TypeHolderExample
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/User.md b/samples/client/petstore/python-legacy/docs/User.md
index 443ac123fdca..b0079f591b6e 100644
--- a/samples/client/petstore/python-legacy/docs/User.md
+++ b/samples/client/petstore/python-legacy/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-legacy/docs/XmlItem.md b/samples/client/petstore/python-legacy/docs/XmlItem.md
index 3dd09833fe52..acaadbdb5f78 100644
--- a/samples/client/petstore/python-legacy/docs/XmlItem.md
+++ b/samples/client/petstore/python-legacy/docs/XmlItem.md
@@ -1,5 +1,6 @@
 # XmlItem
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesAnyType.md
index 9843d35ab906..6d5625857d5e 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesAnyType.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesArray.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesArray.md
index cfe09d91c726..934c43272a94 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesArray.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesArray
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesBoolean.md
index 74f009554a7f..577b141d4703 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesBoolean.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md
index eb3e0524de1a..7e5025e58ce2 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesInteger.md
index a3e58fd1b0bd..4a5e49e0b020 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesInteger.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesInteger
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesNumber.md
index 37eafe1ff031..39a8992fd4a6 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesNumber.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesNumber
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesObject.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesObject.md
index 7f4d6713c758..ec590e3cf96f 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesObject.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesObject
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesString.md b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesString.md
index 9317cfeee80b..c7cc62130506 100644
--- a/samples/client/petstore/python-tornado/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/python-tornado/docs/AdditionalPropertiesString.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesString
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Animal.md b/samples/client/petstore/python-tornado/docs/Animal.md
index 7ed4ba541fa3..8bc43ab53f33 100644
--- a/samples/client/petstore/python-tornado/docs/Animal.md
+++ b/samples/client/petstore/python-tornado/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ApiResponse.md b/samples/client/petstore/python-tornado/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100644
--- a/samples/client/petstore/python-tornado/docs/ApiResponse.md
+++ b/samples/client/petstore/python-tornado/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/python-tornado/docs/ArrayOfArrayOfNumberOnly.md
index aa3988ab1679..b53b6cdb8c46 100644
--- a/samples/client/petstore/python-tornado/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-tornado/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ArrayOfNumberOnly.md b/samples/client/petstore/python-tornado/docs/ArrayOfNumberOnly.md
index 2c3de967aec6..6116bc7489fd 100644
--- a/samples/client/petstore/python-tornado/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/python-tornado/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ArrayTest.md b/samples/client/petstore/python-tornado/docs/ArrayTest.md
index 6ab0d1378065..81420a3b9bbb 100644
--- a/samples/client/petstore/python-tornado/docs/ArrayTest.md
+++ b/samples/client/petstore/python-tornado/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/BigCat.md b/samples/client/petstore/python-tornado/docs/BigCat.md
index 000271f832af..d26809fcff80 100644
--- a/samples/client/petstore/python-tornado/docs/BigCat.md
+++ b/samples/client/petstore/python-tornado/docs/BigCat.md
@@ -1,5 +1,6 @@
 # BigCat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/BigCatAllOf.md b/samples/client/petstore/python-tornado/docs/BigCatAllOf.md
index 621bda6d35a2..c3c42f41da55 100644
--- a/samples/client/petstore/python-tornado/docs/BigCatAllOf.md
+++ b/samples/client/petstore/python-tornado/docs/BigCatAllOf.md
@@ -1,5 +1,6 @@
 # BigCatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Capitalization.md b/samples/client/petstore/python-tornado/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100644
--- a/samples/client/petstore/python-tornado/docs/Capitalization.md
+++ b/samples/client/petstore/python-tornado/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Cat.md b/samples/client/petstore/python-tornado/docs/Cat.md
index 8d30565d014e..b3eff72b3095 100644
--- a/samples/client/petstore/python-tornado/docs/Cat.md
+++ b/samples/client/petstore/python-tornado/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/CatAllOf.md b/samples/client/petstore/python-tornado/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100644
--- a/samples/client/petstore/python-tornado/docs/CatAllOf.md
+++ b/samples/client/petstore/python-tornado/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Category.md b/samples/client/petstore/python-tornado/docs/Category.md
index 7e5c1e316499..095459c80b65 100644
--- a/samples/client/petstore/python-tornado/docs/Category.md
+++ b/samples/client/petstore/python-tornado/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ClassModel.md b/samples/client/petstore/python-tornado/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100644
--- a/samples/client/petstore/python-tornado/docs/ClassModel.md
+++ b/samples/client/petstore/python-tornado/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Client.md b/samples/client/petstore/python-tornado/docs/Client.md
index 88e99384f92c..c3986008d6c3 100644
--- a/samples/client/petstore/python-tornado/docs/Client.md
+++ b/samples/client/petstore/python-tornado/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Dog.md b/samples/client/petstore/python-tornado/docs/Dog.md
index f727487975c4..7eeaf5b68515 100644
--- a/samples/client/petstore/python-tornado/docs/Dog.md
+++ b/samples/client/petstore/python-tornado/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/DogAllOf.md b/samples/client/petstore/python-tornado/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100644
--- a/samples/client/petstore/python-tornado/docs/DogAllOf.md
+++ b/samples/client/petstore/python-tornado/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/EnumArrays.md b/samples/client/petstore/python-tornado/docs/EnumArrays.md
index e15a5f1fd049..92de0e955650 100644
--- a/samples/client/petstore/python-tornado/docs/EnumArrays.md
+++ b/samples/client/petstore/python-tornado/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/EnumClass.md b/samples/client/petstore/python-tornado/docs/EnumClass.md
index 67f017becd0c..64830e3d1dee 100644
--- a/samples/client/petstore/python-tornado/docs/EnumClass.md
+++ b/samples/client/petstore/python-tornado/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/EnumTest.md b/samples/client/petstore/python-tornado/docs/EnumTest.md
index c4c1630250ff..1911bfa918cd 100644
--- a/samples/client/petstore/python-tornado/docs/EnumTest.md
+++ b/samples/client/petstore/python-tornado/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/File.md b/samples/client/petstore/python-tornado/docs/File.md
index f17ba0057d04..63b1d1a65186 100644
--- a/samples/client/petstore/python-tornado/docs/File.md
+++ b/samples/client/petstore/python-tornado/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/FileSchemaTestClass.md b/samples/client/petstore/python-tornado/docs/FileSchemaTestClass.md
index dc3722289887..58d71b7a26be 100644
--- a/samples/client/petstore/python-tornado/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/python-tornado/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/FormatTest.md b/samples/client/petstore/python-tornado/docs/FormatTest.md
index f0942f52484f..239b60134ab5 100644
--- a/samples/client/petstore/python-tornado/docs/FormatTest.md
+++ b/samples/client/petstore/python-tornado/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/HasOnlyReadOnly.md b/samples/client/petstore/python-tornado/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100644
--- a/samples/client/petstore/python-tornado/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/python-tornado/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/List.md b/samples/client/petstore/python-tornado/docs/List.md
index 11f4f3a05f32..4b60956971aa 100644
--- a/samples/client/petstore/python-tornado/docs/List.md
+++ b/samples/client/petstore/python-tornado/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/MapTest.md b/samples/client/petstore/python-tornado/docs/MapTest.md
index a5601691f885..aea74bc8689c 100644
--- a/samples/client/petstore/python-tornado/docs/MapTest.md
+++ b/samples/client/petstore/python-tornado/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python-tornado/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index b9808d5275e5..53e84e839bbb 100644
--- a/samples/client/petstore/python-tornado/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python-tornado/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Model200Response.md b/samples/client/petstore/python-tornado/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100644
--- a/samples/client/petstore/python-tornado/docs/Model200Response.md
+++ b/samples/client/petstore/python-tornado/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ModelReturn.md b/samples/client/petstore/python-tornado/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100644
--- a/samples/client/petstore/python-tornado/docs/ModelReturn.md
+++ b/samples/client/petstore/python-tornado/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Name.md b/samples/client/petstore/python-tornado/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100644
--- a/samples/client/petstore/python-tornado/docs/Name.md
+++ b/samples/client/petstore/python-tornado/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/NumberOnly.md b/samples/client/petstore/python-tornado/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100644
--- a/samples/client/petstore/python-tornado/docs/NumberOnly.md
+++ b/samples/client/petstore/python-tornado/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Order.md b/samples/client/petstore/python-tornado/docs/Order.md
index b5f7b22d34cf..f360fffe8149 100644
--- a/samples/client/petstore/python-tornado/docs/Order.md
+++ b/samples/client/petstore/python-tornado/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/OuterComposite.md b/samples/client/petstore/python-tornado/docs/OuterComposite.md
index bab07ad559eb..31013673df73 100644
--- a/samples/client/petstore/python-tornado/docs/OuterComposite.md
+++ b/samples/client/petstore/python-tornado/docs/OuterComposite.md
@@ -1,5 +1,6 @@
 # OuterComposite
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/OuterEnum.md b/samples/client/petstore/python-tornado/docs/OuterEnum.md
index 06d413b01680..4cb31437c7e2 100644
--- a/samples/client/petstore/python-tornado/docs/OuterEnum.md
+++ b/samples/client/petstore/python-tornado/docs/OuterEnum.md
@@ -1,5 +1,6 @@
 # OuterEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Pet.md b/samples/client/petstore/python-tornado/docs/Pet.md
index 9e15090300f8..c462e794c89a 100644
--- a/samples/client/petstore/python-tornado/docs/Pet.md
+++ b/samples/client/petstore/python-tornado/docs/Pet.md
@@ -1,5 +1,6 @@
 # Pet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/ReadOnlyFirst.md b/samples/client/petstore/python-tornado/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100644
--- a/samples/client/petstore/python-tornado/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/python-tornado/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/SpecialModelName.md b/samples/client/petstore/python-tornado/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100644
--- a/samples/client/petstore/python-tornado/docs/SpecialModelName.md
+++ b/samples/client/petstore/python-tornado/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/Tag.md b/samples/client/petstore/python-tornado/docs/Tag.md
index 243cd98eda69..4ccac4949afc 100644
--- a/samples/client/petstore/python-tornado/docs/Tag.md
+++ b/samples/client/petstore/python-tornado/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/TypeHolderDefault.md b/samples/client/petstore/python-tornado/docs/TypeHolderDefault.md
index 861da021826a..13d283006304 100644
--- a/samples/client/petstore/python-tornado/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/python-tornado/docs/TypeHolderDefault.md
@@ -1,5 +1,6 @@
 # TypeHolderDefault
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/TypeHolderExample.md b/samples/client/petstore/python-tornado/docs/TypeHolderExample.md
index 2a410ded8e35..f75bdd36f647 100644
--- a/samples/client/petstore/python-tornado/docs/TypeHolderExample.md
+++ b/samples/client/petstore/python-tornado/docs/TypeHolderExample.md
@@ -1,5 +1,6 @@
 # TypeHolderExample
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/User.md b/samples/client/petstore/python-tornado/docs/User.md
index 443ac123fdca..b0079f591b6e 100644
--- a/samples/client/petstore/python-tornado/docs/User.md
+++ b/samples/client/petstore/python-tornado/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python-tornado/docs/XmlItem.md b/samples/client/petstore/python-tornado/docs/XmlItem.md
index 3dd09833fe52..acaadbdb5f78 100644
--- a/samples/client/petstore/python-tornado/docs/XmlItem.md
+++ b/samples/client/petstore/python-tornado/docs/XmlItem.md
@@ -1,5 +1,6 @@
 # XmlItem
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/python/docs/AdditionalPropertiesAnyType.md
index 754b2f3ada4c..a69ff4928f44 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesAnyType.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesAnyType
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesArray.md b/samples/client/petstore/python/docs/AdditionalPropertiesArray.md
index 61ac566c14d2..697494b373ff 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesArray.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesArray
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/python/docs/AdditionalPropertiesBoolean.md
index f2567f064cfd..bf7b5be4c13d 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesBoolean.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesBoolean
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
index 4a9d1dd133ce..3646837b853b 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/python/docs/AdditionalPropertiesInteger.md
index fe0ba709c8ef..96345efd4cc8 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesInteger.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesInteger
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/python/docs/AdditionalPropertiesNumber.md
index bec81854b950..9af52dc6dcfd 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesNumber.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesNumber
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesObject.md b/samples/client/petstore/python/docs/AdditionalPropertiesObject.md
index 3fcf2c9299df..73ba59147122 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesObject.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesObject
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AdditionalPropertiesString.md b/samples/client/petstore/python/docs/AdditionalPropertiesString.md
index bbe0b1cbbbb9..fe3993d02265 100644
--- a/samples/client/petstore/python/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/python/docs/AdditionalPropertiesString.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesString
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Animal.md b/samples/client/petstore/python/docs/Animal.md
index 698dc711aeb9..1d1c77c01abc 100644
--- a/samples/client/petstore/python/docs/Animal.md
+++ b/samples/client/petstore/python/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AnimalFarm.md b/samples/client/petstore/python/docs/AnimalFarm.md
index 0717b5d7df1f..fc299cf27d34 100644
--- a/samples/client/petstore/python/docs/AnimalFarm.md
+++ b/samples/client/petstore/python/docs/AnimalFarm.md
@@ -1,5 +1,6 @@
 # AnimalFarm
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/AnotherFakeApi.md b/samples/client/petstore/python/docs/AnotherFakeApi.md
index 7bc6fba30a60..470caed72cc5 100644
--- a/samples/client/petstore/python/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/python/docs/AnotherFakeApi.md
@@ -46,6 +46,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling AnotherFakeApi->call_123_test_special_tags: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -65,6 +66,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/ApiResponse.md b/samples/client/petstore/python/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100644
--- a/samples/client/petstore/python/docs/ApiResponse.md
+++ b/samples/client/petstore/python/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
index 1a68df0090bb..6ab77963788b 100644
--- a/samples/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ArrayOfNumberOnly.md b/samples/client/petstore/python/docs/ArrayOfNumberOnly.md
index b8a760f56dc2..ebc65a54ba7e 100644
--- a/samples/client/petstore/python/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/python/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ArrayTest.md b/samples/client/petstore/python/docs/ArrayTest.md
index b94f23fd2271..4e1bda8fc3af 100644
--- a/samples/client/petstore/python/docs/ArrayTest.md
+++ b/samples/client/petstore/python/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Capitalization.md b/samples/client/petstore/python/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100644
--- a/samples/client/petstore/python/docs/Capitalization.md
+++ b/samples/client/petstore/python/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Cat.md b/samples/client/petstore/python/docs/Cat.md
index b2662bc06c1d..e9ce235cd632 100644
--- a/samples/client/petstore/python/docs/Cat.md
+++ b/samples/client/petstore/python/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/CatAllOf.md b/samples/client/petstore/python/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100644
--- a/samples/client/petstore/python/docs/CatAllOf.md
+++ b/samples/client/petstore/python/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Category.md b/samples/client/petstore/python/docs/Category.md
index 287225d66fd7..940f6a45e641 100644
--- a/samples/client/petstore/python/docs/Category.md
+++ b/samples/client/petstore/python/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Child.md b/samples/client/petstore/python/docs/Child.md
index 28c29d3d761f..eb4392445710 100644
--- a/samples/client/petstore/python/docs/Child.md
+++ b/samples/client/petstore/python/docs/Child.md
@@ -1,5 +1,6 @@
 # Child
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildAllOf.md b/samples/client/petstore/python/docs/ChildAllOf.md
index 47774b92a66a..f9ae99c7c157 100644
--- a/samples/client/petstore/python/docs/ChildAllOf.md
+++ b/samples/client/petstore/python/docs/ChildAllOf.md
@@ -1,5 +1,6 @@
 # ChildAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildCat.md b/samples/client/petstore/python/docs/ChildCat.md
index 328b1b4b591d..9e3a0fb4b51a 100644
--- a/samples/client/petstore/python/docs/ChildCat.md
+++ b/samples/client/petstore/python/docs/ChildCat.md
@@ -1,5 +1,6 @@
 # ChildCat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildCatAllOf.md b/samples/client/petstore/python/docs/ChildCatAllOf.md
index f48345511c10..c5883b9a87c8 100644
--- a/samples/client/petstore/python/docs/ChildCatAllOf.md
+++ b/samples/client/petstore/python/docs/ChildCatAllOf.md
@@ -1,5 +1,6 @@
 # ChildCatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildDog.md b/samples/client/petstore/python/docs/ChildDog.md
index 233f420409b1..9a6e5b372664 100644
--- a/samples/client/petstore/python/docs/ChildDog.md
+++ b/samples/client/petstore/python/docs/ChildDog.md
@@ -1,5 +1,6 @@
 # ChildDog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildDogAllOf.md b/samples/client/petstore/python/docs/ChildDogAllOf.md
index a366fb735c0b..673050667cb3 100644
--- a/samples/client/petstore/python/docs/ChildDogAllOf.md
+++ b/samples/client/petstore/python/docs/ChildDogAllOf.md
@@ -1,5 +1,6 @@
 # ChildDogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildLizard.md b/samples/client/petstore/python/docs/ChildLizard.md
index 9a8b7524c9f9..e881ee0a1d1b 100644
--- a/samples/client/petstore/python/docs/ChildLizard.md
+++ b/samples/client/petstore/python/docs/ChildLizard.md
@@ -1,5 +1,6 @@
 # ChildLizard
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ChildLizardAllOf.md b/samples/client/petstore/python/docs/ChildLizardAllOf.md
index a9f166b9f56a..6e2b70c01505 100644
--- a/samples/client/petstore/python/docs/ChildLizardAllOf.md
+++ b/samples/client/petstore/python/docs/ChildLizardAllOf.md
@@ -1,5 +1,6 @@
 # ChildLizardAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ClassModel.md b/samples/client/petstore/python/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100644
--- a/samples/client/petstore/python/docs/ClassModel.md
+++ b/samples/client/petstore/python/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Client.md b/samples/client/petstore/python/docs/Client.md
index 88e99384f92c..c3986008d6c3 100644
--- a/samples/client/petstore/python/docs/Client.md
+++ b/samples/client/petstore/python/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Dog.md b/samples/client/petstore/python/docs/Dog.md
index ca679f81b41c..7065c4c983d9 100644
--- a/samples/client/petstore/python/docs/Dog.md
+++ b/samples/client/petstore/python/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/DogAllOf.md b/samples/client/petstore/python/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100644
--- a/samples/client/petstore/python/docs/DogAllOf.md
+++ b/samples/client/petstore/python/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/EnumArrays.md b/samples/client/petstore/python/docs/EnumArrays.md
index e0b5582e9d5b..9be5c645a809 100644
--- a/samples/client/petstore/python/docs/EnumArrays.md
+++ b/samples/client/petstore/python/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/EnumClass.md b/samples/client/petstore/python/docs/EnumClass.md
index 6dda7fd8a77f..a1f9aae58190 100644
--- a/samples/client/petstore/python/docs/EnumClass.md
+++ b/samples/client/petstore/python/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/EnumTest.md b/samples/client/petstore/python/docs/EnumTest.md
index 22dd3d5f48d8..eb8842241390 100644
--- a/samples/client/petstore/python/docs/EnumTest.md
+++ b/samples/client/petstore/python/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/FakeApi.md b/samples/client/petstore/python/docs/FakeApi.md
index b098d80fdd33..a107342b75c0 100644
--- a/samples/client/petstore/python/docs/FakeApi.md
+++ b/samples/client/petstore/python/docs/FakeApi.md
@@ -61,6 +61,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->array_model: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -80,6 +81,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -123,6 +125,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->boolean: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -142,6 +145,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -233,6 +237,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->create_xml_item: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -252,6 +257,7 @@ No authorization required
  - **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -296,6 +302,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->number_with_validations: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -315,6 +322,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -363,6 +371,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->object_model_with_ref_props: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -382,6 +391,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -425,6 +435,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->string: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -444,6 +455,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -488,6 +500,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->string_enum: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -507,6 +520,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: */*
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -558,6 +572,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_body_with_file_schema: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -577,6 +592,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -627,6 +643,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_body_with_query_params: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -647,6 +664,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -693,6 +711,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_client_model: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -712,6 +731,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -752,6 +772,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_endpoint_enums_length_one: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -775,6 +796,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -849,6 +871,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling FakeApi->test_endpoint_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -881,6 +904,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -936,6 +960,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_enum_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -962,6 +987,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1018,6 +1044,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_group_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1042,6 +1069,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1084,6 +1112,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_inline_additional_properties: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1103,6 +1132,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1144,6 +1174,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_json_form_data: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1164,6 +1195,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
index 9bf5b1babf20..3452fd6ddff4 100644
--- a/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
+++ b/samples/client/petstore/python/docs/FakeClassnameTags123Api.md
@@ -57,6 +57,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling FakeClassnameTags123Api->test_classname: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -76,6 +77,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/File.md b/samples/client/petstore/python/docs/File.md
index f17ba0057d04..63b1d1a65186 100644
--- a/samples/client/petstore/python/docs/File.md
+++ b/samples/client/petstore/python/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/FileSchemaTestClass.md b/samples/client/petstore/python/docs/FileSchemaTestClass.md
index d0a8bbaaba95..caf2440821da 100644
--- a/samples/client/petstore/python/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/python/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/FormatTest.md b/samples/client/petstore/python/docs/FormatTest.md
index 083b0bd4c98a..aef09bfcc83e 100644
--- a/samples/client/petstore/python/docs/FormatTest.md
+++ b/samples/client/petstore/python/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Grandparent.md b/samples/client/petstore/python/docs/Grandparent.md
index e98808ee5382..b6d80a719457 100644
--- a/samples/client/petstore/python/docs/Grandparent.md
+++ b/samples/client/petstore/python/docs/Grandparent.md
@@ -1,5 +1,6 @@
 # Grandparent
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/GrandparentAnimal.md b/samples/client/petstore/python/docs/GrandparentAnimal.md
index 2a9d89c76d95..15db0708bb1a 100644
--- a/samples/client/petstore/python/docs/GrandparentAnimal.md
+++ b/samples/client/petstore/python/docs/GrandparentAnimal.md
@@ -1,5 +1,6 @@
 # GrandparentAnimal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/HasOnlyReadOnly.md b/samples/client/petstore/python/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100644
--- a/samples/client/petstore/python/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/python/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/List.md b/samples/client/petstore/python/docs/List.md
index 11f4f3a05f32..4b60956971aa 100644
--- a/samples/client/petstore/python/docs/List.md
+++ b/samples/client/petstore/python/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/MapTest.md b/samples/client/petstore/python/docs/MapTest.md
index ad561b7220bf..15228ee1f282 100644
--- a/samples/client/petstore/python/docs/MapTest.md
+++ b/samples/client/petstore/python/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 1484c0638d83..f489944a20af 100644
--- a/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Model200Response.md b/samples/client/petstore/python/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100644
--- a/samples/client/petstore/python/docs/Model200Response.md
+++ b/samples/client/petstore/python/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ModelReturn.md b/samples/client/petstore/python/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100644
--- a/samples/client/petstore/python/docs/ModelReturn.md
+++ b/samples/client/petstore/python/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Name.md b/samples/client/petstore/python/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100644
--- a/samples/client/petstore/python/docs/Name.md
+++ b/samples/client/petstore/python/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/NumberOnly.md b/samples/client/petstore/python/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100644
--- a/samples/client/petstore/python/docs/NumberOnly.md
+++ b/samples/client/petstore/python/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/NumberWithValidations.md b/samples/client/petstore/python/docs/NumberWithValidations.md
index 402eb8325bc7..119e0f678239 100644
--- a/samples/client/petstore/python/docs/NumberWithValidations.md
+++ b/samples/client/petstore/python/docs/NumberWithValidations.md
@@ -1,5 +1,6 @@
 # NumberWithValidations
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ObjectModelWithRefProps.md b/samples/client/petstore/python/docs/ObjectModelWithRefProps.md
index 9a94ef8f61cc..5ff4e52033d6 100644
--- a/samples/client/petstore/python/docs/ObjectModelWithRefProps.md
+++ b/samples/client/petstore/python/docs/ObjectModelWithRefProps.md
@@ -1,6 +1,7 @@
 # ObjectModelWithRefProps
 
 a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Order.md b/samples/client/petstore/python/docs/Order.md
index c21210a3bd59..d29e1a381de8 100644
--- a/samples/client/petstore/python/docs/Order.md
+++ b/samples/client/petstore/python/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Parent.md b/samples/client/petstore/python/docs/Parent.md
index f4c237bb9890..9d3f02d68b31 100644
--- a/samples/client/petstore/python/docs/Parent.md
+++ b/samples/client/petstore/python/docs/Parent.md
@@ -1,5 +1,6 @@
 # Parent
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ParentAllOf.md b/samples/client/petstore/python/docs/ParentAllOf.md
index c76c615cc355..569a5e4af14f 100644
--- a/samples/client/petstore/python/docs/ParentAllOf.md
+++ b/samples/client/petstore/python/docs/ParentAllOf.md
@@ -1,5 +1,6 @@
 # ParentAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ParentPet.md b/samples/client/petstore/python/docs/ParentPet.md
index 2c9775e7e16b..09e409c8fcf1 100644
--- a/samples/client/petstore/python/docs/ParentPet.md
+++ b/samples/client/petstore/python/docs/ParentPet.md
@@ -1,5 +1,6 @@
 # ParentPet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Pet.md b/samples/client/petstore/python/docs/Pet.md
index ce09d401c899..6e78495272e4 100644
--- a/samples/client/petstore/python/docs/Pet.md
+++ b/samples/client/petstore/python/docs/Pet.md
@@ -1,5 +1,6 @@
 # Pet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/PetApi.md b/samples/client/petstore/python/docs/PetApi.md
index 6364be448370..dcff2fcd0727 100644
--- a/samples/client/petstore/python/docs/PetApi.md
+++ b/samples/client/petstore/python/docs/PetApi.md
@@ -78,6 +78,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->add_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -97,6 +98,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -158,6 +160,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->delete_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -178,6 +181,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -236,6 +240,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->find_pets_by_status: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -255,6 +260,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -313,6 +319,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->find_pets_by_tags: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -332,6 +339,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -388,6 +396,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->get_pet_by_id: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -407,6 +416,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -479,6 +489,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->update_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -498,6 +509,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -562,6 +574,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->update_pet_with_form: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -583,6 +596,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -648,6 +662,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->upload_file: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -670,6 +685,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -734,6 +750,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->upload_file_with_required_file: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -755,6 +772,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/Player.md b/samples/client/petstore/python/docs/Player.md
index 17ea34ab2040..2014198aa1bd 100644
--- a/samples/client/petstore/python/docs/Player.md
+++ b/samples/client/petstore/python/docs/Player.md
@@ -1,5 +1,6 @@
 # Player
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/ReadOnlyFirst.md b/samples/client/petstore/python/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100644
--- a/samples/client/petstore/python/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/python/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/SpecialModelName.md b/samples/client/petstore/python/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100644
--- a/samples/client/petstore/python/docs/SpecialModelName.md
+++ b/samples/client/petstore/python/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/StoreApi.md b/samples/client/petstore/python/docs/StoreApi.md
index 30ea16d661f5..b5df4fc1feea 100644
--- a/samples/client/petstore/python/docs/StoreApi.md
+++ b/samples/client/petstore/python/docs/StoreApi.md
@@ -45,6 +45,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->delete_order: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -64,6 +65,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -118,6 +120,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling StoreApi->get_inventory: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -134,6 +137,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -178,6 +182,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->get_order_by_id: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -197,6 +202,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -248,6 +254,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->place_order: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -267,6 +274,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/StringBooleanMap.md b/samples/client/petstore/python/docs/StringBooleanMap.md
index 2fbf3b3767d0..217c79704081 100644
--- a/samples/client/petstore/python/docs/StringBooleanMap.md
+++ b/samples/client/petstore/python/docs/StringBooleanMap.md
@@ -1,5 +1,6 @@
 # StringBooleanMap
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/StringEnum.md b/samples/client/petstore/python/docs/StringEnum.md
index fbedcd04bce9..bb195ec0e453 100644
--- a/samples/client/petstore/python/docs/StringEnum.md
+++ b/samples/client/petstore/python/docs/StringEnum.md
@@ -1,5 +1,6 @@
 # StringEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/Tag.md b/samples/client/petstore/python/docs/Tag.md
index fb8be02da161..b9fe1e0944c4 100644
--- a/samples/client/petstore/python/docs/Tag.md
+++ b/samples/client/petstore/python/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/TypeHolderDefault.md b/samples/client/petstore/python/docs/TypeHolderDefault.md
index 42322d2f4c37..904915aec010 100644
--- a/samples/client/petstore/python/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/python/docs/TypeHolderDefault.md
@@ -1,6 +1,7 @@
 # TypeHolderDefault
 
 a model to test optional properties with server defaults
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/TypeHolderExample.md b/samples/client/petstore/python/docs/TypeHolderExample.md
index 246ac18b2b59..d2954c64dcef 100644
--- a/samples/client/petstore/python/docs/TypeHolderExample.md
+++ b/samples/client/petstore/python/docs/TypeHolderExample.md
@@ -1,6 +1,7 @@
 # TypeHolderExample
 
 a model to test required properties with an example and length one enum
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/User.md b/samples/client/petstore/python/docs/User.md
index 443ac123fdca..b0079f591b6e 100644
--- a/samples/client/petstore/python/docs/User.md
+++ b/samples/client/petstore/python/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/python/docs/UserApi.md b/samples/client/petstore/python/docs/UserApi.md
index 429d7918521d..3c04b81d1967 100644
--- a/samples/client/petstore/python/docs/UserApi.md
+++ b/samples/client/petstore/python/docs/UserApi.md
@@ -59,6 +59,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -78,6 +79,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -130,6 +132,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_users_with_array_input: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -149,6 +152,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -201,6 +205,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_users_with_list_input: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -220,6 +225,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -262,6 +268,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->delete_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -281,6 +288,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -324,6 +332,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->get_user_by_name: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -343,6 +352,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -387,6 +397,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->login_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -407,6 +418,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -447,6 +459,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->logout_user: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -463,6 +476,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -516,6 +530,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->update_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -536,6 +551,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/client/petstore/python/docs/XmlItem.md b/samples/client/petstore/python/docs/XmlItem.md
index d30ca4362293..ea3d7f92804b 100644
--- a/samples/client/petstore/python/docs/XmlItem.md
+++ b/samples/client/petstore/python/docs/XmlItem.md
@@ -1,5 +1,6 @@
 # XmlItem
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/client/petstore/ruby-faraday/.openapi-generator/FILES b/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
index e6cc5300c83a..8003747d27b4 100644
--- a/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
+++ b/samples/client/petstore/ruby-faraday/.openapi-generator/FILES
@@ -47,6 +47,7 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
@@ -106,6 +107,7 @@ lib/petstore/models/outer_enum.rb
 lib/petstore/models/outer_enum_default_value.rb
 lib/petstore/models/outer_enum_integer.rb
 lib/petstore/models/outer_enum_integer_default_value.rb
+lib/petstore/models/outer_object_with_enum_property.rb
 lib/petstore/models/pet.rb
 lib/petstore/models/read_only_first.rb
 lib/petstore/models/special_model_name.rb
diff --git a/samples/client/petstore/ruby-faraday/README.md b/samples/client/petstore/ruby-faraday/README.md
index 35c76f3817e4..f7d8816e8ca8 100644
--- a/samples/client/petstore/ruby-faraday/README.md
+++ b/samples/client/petstore/ruby-faraday/README.md
@@ -83,6 +83,7 @@ Class | Method | HTTP request | Description
 *Petstore::FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *Petstore::FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *Petstore::FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*Petstore::FakeApi* | [**fake_property_enum_integer_serialize**](docs/FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 *Petstore::FakeApi* | [**test_body_with_file_schema**](docs/FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 *Petstore::FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *Petstore::FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
@@ -156,6 +157,7 @@ Class | Method | HTTP request | Description
  - [Petstore::OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [Petstore::OuterEnumInteger](docs/OuterEnumInteger.md)
  - [Petstore::OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [Petstore::OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [Petstore::Pet](docs/Pet.md)
  - [Petstore::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Petstore::SpecialModelName](docs/SpecialModelName.md)
diff --git a/samples/client/petstore/ruby-faraday/docs/FakeApi.md b/samples/client/petstore/ruby-faraday/docs/FakeApi.md
index 5a1b97fd7ed2..ce74242565c9 100644
--- a/samples/client/petstore/ruby-faraday/docs/FakeApi.md
+++ b/samples/client/petstore/ruby-faraday/docs/FakeApi.md
@@ -10,6 +10,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 | [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite |  |
 | [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number |  |
 | [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string |  |
+| [**fake_property_enum_integer_serialize**](FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int |  |
 | [**test_body_with_file_schema**](FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema |  |
 | [**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params |  |
 | [**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model |
@@ -414,6 +415,70 @@ No authorization required
 - **Accept**: */*
 
 
+## fake_property_enum_integer_serialize
+
+> <OuterObjectWithEnumProperty> fake_property_enum_integer_serialize(outer_object_with_enum_property)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Examples
+
+```ruby
+require 'time'
+require 'petstore'
+
+api_instance = Petstore::FakeApi.new
+outer_object_with_enum_property = Petstore::OuterObjectWithEnumProperty.new({value: Petstore::OuterEnumInteger::N0}) # OuterObjectWithEnumProperty | Input enum (int) as post body
+
+begin
+  
+  result = api_instance.fake_property_enum_integer_serialize(outer_object_with_enum_property)
+  p result
+rescue Petstore::ApiError => e
+  puts "Error when calling FakeApi->fake_property_enum_integer_serialize: #{e}"
+end
+```
+
+#### Using the fake_property_enum_integer_serialize_with_http_info variant
+
+This returns an Array which contains the response data, status code and headers.
+
+> <Array(<OuterObjectWithEnumProperty>, Integer, Hash)> fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property)
+
+```ruby
+begin
+  
+  data, status_code, headers = api_instance.fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property)
+  p status_code # => 2xx
+  p headers # => { ... }
+  p data # => <OuterObjectWithEnumProperty>
+rescue Petstore::ApiError => e
+  puts "Error when calling FakeApi->fake_property_enum_integer_serialize_with_http_info: #{e}"
+end
+```
+
+### Parameters
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **outer_object_with_enum_property** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md) | Input enum (int) as post body |  |
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: */*
+
+
 ## test_body_with_file_schema
 
 > test_body_with_file_schema(file_schema_test_class)
diff --git a/samples/client/petstore/ruby-faraday/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/ruby-faraday/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..dfd9de4596ef
--- /dev/null
+++ b/samples/client/petstore/ruby-faraday/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,18 @@
+# Petstore::OuterObjectWithEnumProperty
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  |  |
+
+## Example
+
+```ruby
+require 'petstore'
+
+instance = Petstore::OuterObjectWithEnumProperty.new(
+  value: null
+)
+```
+
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb
index a8429acce5ad..6581c8cac63d 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore.rb
@@ -55,6 +55,7 @@ require 'petstore/models/outer_enum'
 require 'petstore/models/outer_enum_default_value'
 require 'petstore/models/outer_enum_integer'
 require 'petstore/models/outer_enum_integer_default_value'
+require 'petstore/models/outer_object_with_enum_property'
 require 'petstore/models/pet'
 require 'petstore/models/read_only_first'
 require 'petstore/models/special_model_name'
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
index be1060ef9386..3c933b61a830 100644
--- a/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/api/fake_api.rb
@@ -377,6 +377,69 @@ module Petstore
       return data, status_code, headers
     end
 
+    # Test serialization of enum (int) properties with examples
+    # @param outer_object_with_enum_property [OuterObjectWithEnumProperty] Input enum (int) as post body
+    # @param [Hash] opts the optional parameters
+    # @return [OuterObjectWithEnumProperty]
+    def fake_property_enum_integer_serialize(outer_object_with_enum_property, opts = {})
+      data, _status_code, _headers = fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, opts)
+      data
+    end
+
+    # Test serialization of enum (int) properties with examples
+    # @param outer_object_with_enum_property [OuterObjectWithEnumProperty] Input enum (int) as post body
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(OuterObjectWithEnumProperty, Integer, Hash)>] OuterObjectWithEnumProperty data, response status code and response headers
+    def fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: FakeApi.fake_property_enum_integer_serialize ...'
+      end
+      # verify the required parameter 'outer_object_with_enum_property' is set
+      if @api_client.config.client_side_validation && outer_object_with_enum_property.nil?
+        fail ArgumentError, "Missing the required parameter 'outer_object_with_enum_property' when calling FakeApi.fake_property_enum_integer_serialize"
+      end
+      # resource path
+      local_var_path = '/fake/property/enum-int'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(outer_object_with_enum_property)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'OuterObjectWithEnumProperty'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"FakeApi.fake_property_enum_integer_serialize",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: FakeApi#fake_property_enum_integer_serialize\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # For this test, the body for this request much reference a schema named `File`.
     # @param file_schema_test_class [FileSchemaTestClass] 
     # @param [Hash] opts the optional parameters
diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb
new file mode 100644
index 000000000000..f130abc9be35
--- /dev/null
+++ b/samples/client/petstore/ruby-faraday/lib/petstore/models/outer_object_with_enum_property.rb
@@ -0,0 +1,223 @@
+=begin
+#OpenAPI Petstore
+
+#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.0-SNAPSHOT
+
+=end
+
+require 'date'
+require 'time'
+
+module Petstore
+  class OuterObjectWithEnumProperty
+    attr_accessor :value
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'value' => :'value'
+      }
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'value' => :'OuterEnumInteger'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::OuterObjectWithEnumProperty` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::OuterObjectWithEnumProperty`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:'value')
+        self.value = attributes[:'value']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      if @value.nil?
+        invalid_properties.push('invalid value for "value", value cannot be nil.')
+      end
+
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return false if @value.nil?
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          value == o.value
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [value].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = Petstore.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end
diff --git a/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb b/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb
new file mode 100644
index 000000000000..561ef7172b82
--- /dev/null
+++ b/samples/client/petstore/ruby-faraday/spec/models/outer_object_with_enum_property_spec.rb
@@ -0,0 +1,34 @@
+=begin
+#OpenAPI Petstore
+
+#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.0-SNAPSHOT
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::OuterObjectWithEnumProperty
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe Petstore::OuterObjectWithEnumProperty do
+  let(:instance) { Petstore::OuterObjectWithEnumProperty.new }
+
+  describe 'test an instance of OuterObjectWithEnumProperty' do
+    it 'should create an instance of OuterObjectWithEnumProperty' do
+      expect(instance).to be_instance_of(Petstore::OuterObjectWithEnumProperty)
+    end
+  end
+  describe 'test attribute "value"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end
diff --git a/samples/client/petstore/ruby/.openapi-generator/FILES b/samples/client/petstore/ruby/.openapi-generator/FILES
index e6cc5300c83a..8003747d27b4 100644
--- a/samples/client/petstore/ruby/.openapi-generator/FILES
+++ b/samples/client/petstore/ruby/.openapi-generator/FILES
@@ -47,6 +47,7 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
@@ -106,6 +107,7 @@ lib/petstore/models/outer_enum.rb
 lib/petstore/models/outer_enum_default_value.rb
 lib/petstore/models/outer_enum_integer.rb
 lib/petstore/models/outer_enum_integer_default_value.rb
+lib/petstore/models/outer_object_with_enum_property.rb
 lib/petstore/models/pet.rb
 lib/petstore/models/read_only_first.rb
 lib/petstore/models/special_model_name.rb
diff --git a/samples/client/petstore/ruby/README.md b/samples/client/petstore/ruby/README.md
index 35c76f3817e4..f7d8816e8ca8 100644
--- a/samples/client/petstore/ruby/README.md
+++ b/samples/client/petstore/ruby/README.md
@@ -83,6 +83,7 @@ Class | Method | HTTP request | Description
 *Petstore::FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *Petstore::FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *Petstore::FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*Petstore::FakeApi* | [**fake_property_enum_integer_serialize**](docs/FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 *Petstore::FakeApi* | [**test_body_with_file_schema**](docs/FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 *Petstore::FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *Petstore::FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \"client\" model
@@ -156,6 +157,7 @@ Class | Method | HTTP request | Description
  - [Petstore::OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [Petstore::OuterEnumInteger](docs/OuterEnumInteger.md)
  - [Petstore::OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [Petstore::OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [Petstore::Pet](docs/Pet.md)
  - [Petstore::ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [Petstore::SpecialModelName](docs/SpecialModelName.md)
diff --git a/samples/client/petstore/ruby/docs/FakeApi.md b/samples/client/petstore/ruby/docs/FakeApi.md
index 5a1b97fd7ed2..ce74242565c9 100644
--- a/samples/client/petstore/ruby/docs/FakeApi.md
+++ b/samples/client/petstore/ruby/docs/FakeApi.md
@@ -10,6 +10,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 | [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite |  |
 | [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number |  |
 | [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string |  |
+| [**fake_property_enum_integer_serialize**](FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int |  |
 | [**test_body_with_file_schema**](FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema |  |
 | [**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params |  |
 | [**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model |
@@ -414,6 +415,70 @@ No authorization required
 - **Accept**: */*
 
 
+## fake_property_enum_integer_serialize
+
+> <OuterObjectWithEnumProperty> fake_property_enum_integer_serialize(outer_object_with_enum_property)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Examples
+
+```ruby
+require 'time'
+require 'petstore'
+
+api_instance = Petstore::FakeApi.new
+outer_object_with_enum_property = Petstore::OuterObjectWithEnumProperty.new({value: Petstore::OuterEnumInteger::N0}) # OuterObjectWithEnumProperty | Input enum (int) as post body
+
+begin
+  
+  result = api_instance.fake_property_enum_integer_serialize(outer_object_with_enum_property)
+  p result
+rescue Petstore::ApiError => e
+  puts "Error when calling FakeApi->fake_property_enum_integer_serialize: #{e}"
+end
+```
+
+#### Using the fake_property_enum_integer_serialize_with_http_info variant
+
+This returns an Array which contains the response data, status code and headers.
+
+> <Array(<OuterObjectWithEnumProperty>, Integer, Hash)> fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property)
+
+```ruby
+begin
+  
+  data, status_code, headers = api_instance.fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property)
+  p status_code # => 2xx
+  p headers # => { ... }
+  p data # => <OuterObjectWithEnumProperty>
+rescue Petstore::ApiError => e
+  puts "Error when calling FakeApi->fake_property_enum_integer_serialize_with_http_info: #{e}"
+end
+```
+
+### Parameters
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **outer_object_with_enum_property** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md) | Input enum (int) as post body |  |
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: */*
+
+
 ## test_body_with_file_schema
 
 > test_body_with_file_schema(file_schema_test_class)
diff --git a/samples/client/petstore/ruby/docs/OuterObjectWithEnumProperty.md b/samples/client/petstore/ruby/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..dfd9de4596ef
--- /dev/null
+++ b/samples/client/petstore/ruby/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,18 @@
+# Petstore::OuterObjectWithEnumProperty
+
+## Properties
+
+| Name | Type | Description | Notes |
+| ---- | ---- | ----------- | ----- |
+| **value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  |  |
+
+## Example
+
+```ruby
+require 'petstore'
+
+instance = Petstore::OuterObjectWithEnumProperty.new(
+  value: null
+)
+```
+
diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
index a8429acce5ad..6581c8cac63d 100644
--- a/samples/client/petstore/ruby/lib/petstore.rb
+++ b/samples/client/petstore/ruby/lib/petstore.rb
@@ -55,6 +55,7 @@ require 'petstore/models/outer_enum'
 require 'petstore/models/outer_enum_default_value'
 require 'petstore/models/outer_enum_integer'
 require 'petstore/models/outer_enum_integer_default_value'
+require 'petstore/models/outer_object_with_enum_property'
 require 'petstore/models/pet'
 require 'petstore/models/read_only_first'
 require 'petstore/models/special_model_name'
diff --git a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
index be1060ef9386..3c933b61a830 100644
--- a/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
+++ b/samples/client/petstore/ruby/lib/petstore/api/fake_api.rb
@@ -377,6 +377,69 @@ module Petstore
       return data, status_code, headers
     end
 
+    # Test serialization of enum (int) properties with examples
+    # @param outer_object_with_enum_property [OuterObjectWithEnumProperty] Input enum (int) as post body
+    # @param [Hash] opts the optional parameters
+    # @return [OuterObjectWithEnumProperty]
+    def fake_property_enum_integer_serialize(outer_object_with_enum_property, opts = {})
+      data, _status_code, _headers = fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, opts)
+      data
+    end
+
+    # Test serialization of enum (int) properties with examples
+    # @param outer_object_with_enum_property [OuterObjectWithEnumProperty] Input enum (int) as post body
+    # @param [Hash] opts the optional parameters
+    # @return [Array<(OuterObjectWithEnumProperty, Integer, Hash)>] OuterObjectWithEnumProperty data, response status code and response headers
+    def fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, opts = {})
+      if @api_client.config.debugging
+        @api_client.config.logger.debug 'Calling API: FakeApi.fake_property_enum_integer_serialize ...'
+      end
+      # verify the required parameter 'outer_object_with_enum_property' is set
+      if @api_client.config.client_side_validation && outer_object_with_enum_property.nil?
+        fail ArgumentError, "Missing the required parameter 'outer_object_with_enum_property' when calling FakeApi.fake_property_enum_integer_serialize"
+      end
+      # resource path
+      local_var_path = '/fake/property/enum-int'
+
+      # query parameters
+      query_params = opts[:query_params] || {}
+
+      # header parameters
+      header_params = opts[:header_params] || {}
+      # HTTP header 'Accept' (if needed)
+      header_params['Accept'] = @api_client.select_header_accept(['*/*'])
+      # HTTP header 'Content-Type'
+      header_params['Content-Type'] = @api_client.select_header_content_type(['application/json'])
+
+      # form parameters
+      form_params = opts[:form_params] || {}
+
+      # http body (model)
+      post_body = opts[:debug_body] || @api_client.object_to_http_body(outer_object_with_enum_property)
+
+      # return_type
+      return_type = opts[:debug_return_type] || 'OuterObjectWithEnumProperty'
+
+      # auth_names
+      auth_names = opts[:debug_auth_names] || []
+
+      new_options = opts.merge(
+        :operation => :"FakeApi.fake_property_enum_integer_serialize",
+        :header_params => header_params,
+        :query_params => query_params,
+        :form_params => form_params,
+        :body => post_body,
+        :auth_names => auth_names,
+        :return_type => return_type
+      )
+
+      data, status_code, headers = @api_client.call_api(:POST, local_var_path, new_options)
+      if @api_client.config.debugging
+        @api_client.config.logger.debug "API called: FakeApi#fake_property_enum_integer_serialize\nData: #{data.inspect}\nStatus code: #{status_code}\nHeaders: #{headers}"
+      end
+      return data, status_code, headers
+    end
+
     # For this test, the body for this request much reference a schema named `File`.
     # @param file_schema_test_class [FileSchemaTestClass] 
     # @param [Hash] opts the optional parameters
diff --git a/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb
new file mode 100644
index 000000000000..f130abc9be35
--- /dev/null
+++ b/samples/client/petstore/ruby/lib/petstore/models/outer_object_with_enum_property.rb
@@ -0,0 +1,223 @@
+=begin
+#OpenAPI Petstore
+
+#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.0-SNAPSHOT
+
+=end
+
+require 'date'
+require 'time'
+
+module Petstore
+  class OuterObjectWithEnumProperty
+    attr_accessor :value
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        :'value' => :'value'
+      }
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      attribute_map.values
+    end
+
+    # Attribute type mapping.
+    def self.openapi_types
+      {
+        :'value' => :'OuterEnumInteger'
+      }
+    end
+
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    def initialize(attributes = {})
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `Petstore::OuterObjectWithEnumProperty` initialize method"
+      end
+
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `Petstore::OuterObjectWithEnumProperty`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
+
+      if attributes.key?(:'value')
+        self.value = attributes[:'value']
+      end
+    end
+
+    # Show invalid properties with the reasons. Usually used together with valid?
+    # @return Array for valid properties with the reasons
+    def list_invalid_properties
+      invalid_properties = Array.new
+      if @value.nil?
+        invalid_properties.push('invalid value for "value", value cannot be nil.')
+      end
+
+      invalid_properties
+    end
+
+    # Check to see if the all the properties in the model are valid
+    # @return true if the model is valid
+    def valid?
+      return false if @value.nil?
+      true
+    end
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] Object to be compared
+    def ==(o)
+      return true if self.equal?(o)
+      self.class == o.class &&
+          value == o.value
+    end
+
+    # @see the `==` method
+    # @param [Object] Object to be compared
+    def eql?(o)
+      self == o
+    end
+
+    # Calculates hash code according to all attributes.
+    # @return [Integer] Hash code
+    def hash
+      [value].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+      self.class.openapi_types.each_pair do |key, type|
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
+        end
+      end
+
+      self
+    end
+
+    # Deserializes the data based on type
+    # @param string type Data type
+    # @param string value Value to be deserialized
+    # @return [Object] Deserialized data
+    def _deserialize(type, value)
+      case type.to_sym
+      when :Time
+        Time.parse(value)
+      when :Date
+        Date.parse(value)
+      when :String
+        value.to_s
+      when :Integer
+        value.to_i
+      when :Float
+        value.to_f
+      when :Boolean
+        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+          true
+        else
+          false
+        end
+      when :Object
+        # generic object (usually a Hash), return directly
+        value
+      when /\AArray<(?<inner_type>.+)>\z/
+        inner_type = Regexp.last_match[:inner_type]
+        value.map { |v| _deserialize(inner_type, v) }
+      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+        k_type = Regexp.last_match[:k_type]
+        v_type = Regexp.last_match[:v_type]
+        {}.tap do |hash|
+          value.each do |k, v|
+            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+          end
+        end
+      else # model
+        # models (e.g. Pet) or oneOf
+        klass = Petstore.const_get(type)
+        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+      end
+    end
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # to_body is an alias to to_hash (backward compatibility)
+    # @return [Hash] Returns the object in the form of hash
+    def to_body
+      to_hash
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = self.send(attr)
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+
+  end
+
+end
diff --git a/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb b/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb
new file mode 100644
index 000000000000..561ef7172b82
--- /dev/null
+++ b/samples/client/petstore/ruby/spec/models/outer_object_with_enum_property_spec.rb
@@ -0,0 +1,34 @@
+=begin
+#OpenAPI Petstore
+
+#This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+The version of the OpenAPI document: 1.0.0
+
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 5.1.0-SNAPSHOT
+
+=end
+
+require 'spec_helper'
+require 'json'
+require 'date'
+
+# Unit tests for Petstore::OuterObjectWithEnumProperty
+# Automatically generated by openapi-generator (https://openapi-generator.tech)
+# Please update as you see appropriate
+describe Petstore::OuterObjectWithEnumProperty do
+  let(:instance) { Petstore::OuterObjectWithEnumProperty.new }
+
+  describe 'test an instance of OuterObjectWithEnumProperty' do
+    it 'should create an instance of OuterObjectWithEnumProperty' do
+      expect(instance).to be_instance_of(Petstore::OuterObjectWithEnumProperty)
+    end
+  end
+  describe 'test attribute "value"' do
+    it 'should work' do
+      # assertion here. ref: https://www.relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
+    end
+  end
+
+end
diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v10-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v11-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
index aba929bd4edd..1d41428c5766 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/angular2-typescript-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/single-request-parameter/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
index c0d11ad67b1b..1d3f3340be4b 100644
--- a/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
+++ b/samples/client/petstore/typescript-angular-v8-provided-in-root/builds/with-prefixed-module-name/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { PetStoreApiModule, PetStoreConfiguration, PetStoreConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): PetStoreConfiguration => {
+export function apiConfigFactory (): PetStoreConfiguration {
   const params: PetStoreConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-any/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
index bdfdd518ee93..f16604dcfff1 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/default/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
index c7e2bfffb5d6..33aa0a2c9cef 100644
--- a/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
+++ b/samples/client/petstore/typescript-angular-v9-provided-in-root/builds/with-npm/README.md
@@ -75,7 +75,7 @@ export class AppModule {}
 // configuring providers
 import { ApiModule, Configuration, ConfigurationParameters } from '@openapitools/typescript-angular-petstore';
 
-export function apiConfigFactory (): Configuration => {
+export function apiConfigFactory (): Configuration {
   const params: ConfigurationParameters = {
     // set configuration parameters here.
   }
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
index f59d2325423e..79b62dce8a33 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/.openapi-generator/FILES
@@ -44,6 +44,7 @@ models/OuterEnum.ts
 models/OuterEnumDefaultValue.ts
 models/OuterEnumInteger.ts
 models/OuterEnumIntegerDefaultValue.ts
+models/OuterObjectWithEnumProperty.ts
 models/Pet.ts
 models/ReadOnlyFirst.ts
 models/Return.ts
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
index 2ac64725a384..358d9a5b09bb 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/FakeApi.ts
@@ -27,6 +27,9 @@ import {
     OuterComposite,
     OuterCompositeFromJSON,
     OuterCompositeToJSON,
+    OuterObjectWithEnumProperty,
+    OuterObjectWithEnumPropertyFromJSON,
+    OuterObjectWithEnumPropertyToJSON,
     Pet,
     PetFromJSON,
     PetToJSON,
@@ -57,6 +60,10 @@ export interface FakeOuterStringSerializeRequest {
     body?: string;
 }
 
+export interface FakePropertyEnumIntegerSerializeRequest {
+    outerObjectWithEnumProperty: OuterObjectWithEnumProperty;
+}
+
 export interface TestBodyWithFileSchemaRequest {
     fileSchemaTestClass: FileSchemaTestClass;
 }
@@ -311,6 +318,39 @@ export class FakeApi extends runtime.BaseAPI {
         return await response.value();
     }
 
+    /**
+     * Test serialization of enum (int) properties with examples
+     */
+    async fakePropertyEnumIntegerSerializeRaw(requestParameters: FakePropertyEnumIntegerSerializeRequest): Promise<runtime.ApiResponse<OuterObjectWithEnumProperty>> {
+        if (requestParameters.outerObjectWithEnumProperty === null || requestParameters.outerObjectWithEnumProperty === undefined) {
+            throw new runtime.RequiredError('outerObjectWithEnumProperty','Required parameter requestParameters.outerObjectWithEnumProperty was null or undefined when calling fakePropertyEnumIntegerSerialize.');
+        }
+
+        const queryParameters: any = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/fake/property/enum-int`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: OuterObjectWithEnumPropertyToJSON(requestParameters.outerObjectWithEnumProperty),
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => OuterObjectWithEnumPropertyFromJSON(jsonValue));
+    }
+
+    /**
+     * Test serialization of enum (int) properties with examples
+     */
+    async fakePropertyEnumIntegerSerialize(requestParameters: FakePropertyEnumIntegerSerializeRequest): Promise<OuterObjectWithEnumProperty> {
+        const response = await this.fakePropertyEnumIntegerSerializeRaw(requestParameters);
+        return await response.value();
+    }
+
     /**
      * For this test, the body for this request much reference a schema named `File`.
      */
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts
new file mode 100644
index 000000000000..61d78ab5ff5c
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/OuterObjectWithEnumProperty.ts
@@ -0,0 +1,64 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ */
+
+import { exists, mapValues } from '../runtime';
+import {
+    OuterEnumInteger,
+    OuterEnumIntegerFromJSON,
+    OuterEnumIntegerFromJSONTyped,
+    OuterEnumIntegerToJSON,
+} from './';
+
+/**
+ * 
+ * @export
+ * @interface OuterObjectWithEnumProperty
+ */
+export interface OuterObjectWithEnumProperty {
+    /**
+     * 
+     * @type {OuterEnumInteger}
+     * @memberof OuterObjectWithEnumProperty
+     */
+    value: OuterEnumInteger;
+}
+
+export function OuterObjectWithEnumPropertyFromJSON(json: any): OuterObjectWithEnumProperty {
+    return OuterObjectWithEnumPropertyFromJSONTyped(json, false);
+}
+
+export function OuterObjectWithEnumPropertyFromJSONTyped(json: any, ignoreDiscriminator: boolean): OuterObjectWithEnumProperty {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'value': OuterEnumIntegerFromJSON(json['value']),
+    };
+}
+
+export function OuterObjectWithEnumPropertyToJSON(value?: OuterObjectWithEnumProperty | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'value': OuterEnumIntegerToJSON(value.value),
+    };
+}
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
index 9d4091d73367..b1f2e3ff99f9 100644
--- a/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default-v3.0/models/index.ts
@@ -35,6 +35,7 @@ export * from './OuterEnum';
 export * from './OuterEnumDefaultValue';
 export * from './OuterEnumInteger';
 export * from './OuterEnumIntegerDefaultValue';
+export * from './OuterObjectWithEnumProperty';
 export * from './Pet';
 export * from './ReadOnlyFirst';
 export * from './Return';
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/python/docs/UsageApi.md b/samples/openapi3/client/extensions/x-auth-id-alias/python/docs/UsageApi.md
index cf3a8e1910fd..ef6b5c4b05bf 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/python/docs/UsageApi.md
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/python/docs/UsageApi.md
@@ -63,6 +63,7 @@ with x_auth_id_alias.ApiClient(configuration) as api_client:
         print("Exception when calling UsageApi->any_key: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -79,6 +80,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -139,6 +141,7 @@ with x_auth_id_alias.ApiClient(configuration) as api_client:
         print("Exception when calling UsageApi->both_keys: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -155,6 +158,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -208,6 +212,7 @@ with x_auth_id_alias.ApiClient(configuration) as api_client:
         print("Exception when calling UsageApi->key_in_header: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -224,6 +229,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -277,6 +283,7 @@ with x_auth_id_alias.ApiClient(configuration) as api_client:
         print("Exception when calling UsageApi->key_in_query: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -293,6 +300,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/features/dynamic-servers/python/docs/UsageApi.md b/samples/openapi3/client/features/dynamic-servers/python/docs/UsageApi.md
index 37f849e1b456..b36425e24bbd 100644
--- a/samples/openapi3/client/features/dynamic-servers/python/docs/UsageApi.md
+++ b/samples/openapi3/client/features/dynamic-servers/python/docs/UsageApi.md
@@ -43,6 +43,7 @@ with dynamic_servers.ApiClient() as api_client:
         print("Exception when calling UsageApi->custom_server: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -59,6 +60,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -101,6 +103,7 @@ with dynamic_servers.ApiClient() as api_client:
         print("Exception when calling UsageApi->default_server: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -117,6 +120,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
index f45f5e128cc5..cd7cef8cc4fa 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/pubspec.yaml
@@ -2,13 +2,13 @@ name: openapi
 version: 1.0.0
 description: OpenAPI API client
 environment:
-    sdk: ">=2.7.0 <3.0.0"
+    sdk: '>=2.7.0 <3.0.0'
 dependencies:
     dio: ^3.0.9
-    built_value: ">=7.1.0 <9.0.0"
-    built_collection: ">=4.3.2 <6.0.0"
+    built_value: '>=7.1.0 <8.0.0'
+    built_collection: '>=4.3.2 <5.0.0'
 dev_dependencies:
-    built_value_generator: ">=7.1.0 <9.0.0"
+    built_value_generator: '>=7.1.0 <8.0.0'
     build_runner: ^1.7.1
-    test: ">=1.3.0 <1.16.0"
+    test: '>=1.3.0 <1.16.0'
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
index a4900515e291..5edf74fce524 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/.openapi-generator/FILES
@@ -43,6 +43,7 @@ doc/OuterEnum.md
 doc/OuterEnumDefaultValue.md
 doc/OuterEnumInteger.md
 doc/OuterEnumIntegerDefaultValue.md
+doc/OuterObjectWithEnumProperty.md
 doc/Pet.md
 doc/PetApi.md
 doc/ReadOnlyFirst.md
@@ -102,6 +103,7 @@ lib/model/outer_enum.dart
 lib/model/outer_enum_default_value.dart
 lib/model/outer_enum_integer.dart
 lib/model/outer_enum_integer_default_value.dart
+lib/model/outer_object_with_enum_property.dart
 lib/model/pet.dart
 lib/model/read_only_first.dart
 lib/model/special_model_name.dart
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
index fa9f4d96b152..b22891db2144 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/README.md
@@ -66,6 +66,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterCompositeSerialize**](doc//FakeApi.md#fakeoutercompositeserialize) | **post** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](doc//FakeApi.md#fakeouternumberserialize) | **post** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](doc//FakeApi.md#fakeouterstringserialize) | **post** /fake/outer/string | 
+*FakeApi* | [**fakePropertyEnumIntegerSerialize**](doc//FakeApi.md#fakepropertyenumintegerserialize) | **post** /fake/property/enum-int | 
 *FakeApi* | [**testBodyWithFileSchema**](doc//FakeApi.md#testbodywithfileschema) | **put** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](doc//FakeApi.md#testbodywithqueryparams) | **put** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](doc//FakeApi.md#testclientmodel) | **patch** /fake | To test \&quot;client\&quot; model
@@ -139,6 +140,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumDefaultValue](doc//OuterEnumDefaultValue.md)
  - [OuterEnumInteger](doc//OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](doc//OuterEnumIntegerDefaultValue.md)
+ - [OuterObjectWithEnumProperty](doc//OuterObjectWithEnumProperty.md)
  - [Pet](doc//Pet.md)
  - [ReadOnlyFirst](doc//ReadOnlyFirst.md)
  - [SpecialModelName](doc//SpecialModelName.md)
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
index c40ba1e5c158..ef42f41081fd 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/FakeApi.md
@@ -15,6 +15,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **post** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **post** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **post** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **post** /fake/property/enum-int | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **put** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **put** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **patch** /fake | To test \&quot;client\&quot; model
@@ -282,6 +283,49 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **fakePropertyEnumIntegerSerialize**
+> OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new FakeApi();
+var outerObjectWithEnumProperty = new OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+
+try { 
+    var result = api_instance.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
+    print(result);
+} catch (e) {
+    print('Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: */*
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **testBodyWithFileSchema**
 > testBodyWithFileSchema(fileSchemaTestClass)
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..eab2ae8f66b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md
@@ -0,0 +1,15 @@
+# openapi.model.OuterObjectWithEnumProperty
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/api/fake_api.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/api/fake_api.dart
index 6f9d4984f8b9..6264437cbab3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/api/fake_api.dart
@@ -11,6 +11,7 @@ import 'package:built_value/serializer.dart';
 
 import 'package:openapi/model/file_schema_test_class.dart';
 import 'package:openapi/model/outer_composite.dart';
+import 'package:openapi/model/outer_object_with_enum_property.dart';
 import 'package:openapi/model/user.dart';
 import 'package:openapi/model/health_check_result.dart';
 import 'package:openapi/model/pet.dart';
@@ -365,6 +366,66 @@ class FakeApi {
     );
   }
 
+  /// 
+  ///
+  /// Test serialization of enum (int) properties with examples
+  Future<Response<OuterObjectWithEnumProperty>> fakePropertyEnumIntegerSerialize(
+    OuterObjectWithEnumProperty outerObjectWithEnumProperty, { 
+    CancelToken cancelToken,
+    Map<String, dynamic> headers,
+    Map<String, dynamic> extra,
+    ValidateStatus validateStatus,
+    ProgressCallback onSendProgress,
+    ProgressCallback onReceiveProgress,
+  }) async {
+    final _request = RequestOptions(
+      path: r'/fake/property/enum-int',
+      method: 'POST',
+      headers: <String, dynamic>{
+        ...?headers,
+      },
+      extra: <String, dynamic>{
+        'secure': <Map<String, String>>[],
+        ...?extra,
+      },
+      validateStatus: validateStatus,
+      contentType: [
+        'application/json',
+      ].first,
+      cancelToken: cancelToken,
+      onSendProgress: onSendProgress,
+      onReceiveProgress: onReceiveProgress,
+    );
+
+    dynamic _bodyData;
+
+    const _type = FullType(OuterObjectWithEnumProperty);
+    _bodyData = _serializers.serialize(outerObjectWithEnumProperty, specifiedType: _type);
+
+    final _response = await _dio.request<dynamic>(
+      _request.path,
+      data: _bodyData,
+      options: _request,
+    );
+
+    const _responseType = FullType(OuterObjectWithEnumProperty);
+    final _responseData = _serializers.deserialize(
+      _response.data,
+      specifiedType: _responseType,
+    ) as OuterObjectWithEnumProperty;
+
+    return Response<OuterObjectWithEnumProperty>(
+      data: _responseData,
+      headers: _response.headers,
+      isRedirect: _response.isRedirect,
+      request: _response.request,
+      redirects: _response.redirects,
+      statusCode: _response.statusCode,
+      statusMessage: _response.statusMessage,
+      extra: _response.extra,
+    );
+  }
+
   /// 
   ///
   /// For this test, the body for this request much reference a schema named `File`.
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart
new file mode 100644
index 000000000000..caf3ce86097c
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart
@@ -0,0 +1,68 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.7
+
+// ignore_for_file: unused_import
+
+import 'package:openapi/model/outer_enum_integer.dart';
+import 'package:built_value/built_value.dart';
+import 'package:built_value/serializer.dart';
+
+part 'outer_object_with_enum_property.g.dart';
+
+abstract class OuterObjectWithEnumProperty implements Built<OuterObjectWithEnumProperty, OuterObjectWithEnumPropertyBuilder> {
+
+    @BuiltValueField(wireName: r'value')
+    OuterEnumInteger get value;
+    // enum valueEnum {  0,  1,  2,  };
+
+    OuterObjectWithEnumProperty._();
+
+    static void _initializeBuilder(OuterObjectWithEnumPropertyBuilder b) => b;
+
+    factory OuterObjectWithEnumProperty([void updates(OuterObjectWithEnumPropertyBuilder b)]) = _$OuterObjectWithEnumProperty;
+
+    @BuiltValueSerializer(custom: true)
+    static Serializer<OuterObjectWithEnumProperty> get serializer => _$OuterObjectWithEnumPropertySerializer();
+}
+
+class _$OuterObjectWithEnumPropertySerializer implements StructuredSerializer<OuterObjectWithEnumProperty> {
+
+    @override
+    final Iterable<Type> types = const [OuterObjectWithEnumProperty, _$OuterObjectWithEnumProperty];
+    @override
+    final String wireName = r'OuterObjectWithEnumProperty';
+
+    @override
+    Iterable<Object> serialize(Serializers serializers, OuterObjectWithEnumProperty object,
+        {FullType specifiedType = FullType.unspecified}) {
+        final result = <Object>[];
+        result
+            ..add(r'value')
+            ..add(serializers.serialize(object.value,
+                specifiedType: const FullType(OuterEnumInteger)));
+        return result;
+    }
+
+    @override
+    OuterObjectWithEnumProperty deserialize(Serializers serializers, Iterable<Object> serialized,
+        {FullType specifiedType = FullType.unspecified}) {
+        final result = OuterObjectWithEnumPropertyBuilder();
+
+        final iterator = serialized.iterator;
+        while (iterator.moveNext()) {
+            final key = iterator.current as String;
+            iterator.moveNext();
+            final dynamic value = iterator.current;
+            switch (key) {
+                case r'value':
+                    result.value = serializers.deserialize(value,
+                        specifiedType: const FullType(OuterEnumInteger)) as OuterEnumInteger;
+                    break;
+            }
+        }
+        return result.build();
+    }
+}
+
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
index a484bd35d30d..dd7f28bd0dbd 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/serializers.dart
@@ -51,6 +51,7 @@ import 'package:openapi/model/outer_enum.dart';
 import 'package:openapi/model/outer_enum_default_value.dart';
 import 'package:openapi/model/outer_enum_integer.dart';
 import 'package:openapi/model/outer_enum_integer_default_value.dart';
+import 'package:openapi/model/outer_object_with_enum_property.dart';
 import 'package:openapi/model/pet.dart';
 import 'package:openapi/model/read_only_first.dart';
 import 'package:openapi/model/special_model_name.dart';
@@ -98,6 +99,7 @@ part 'serializers.g.dart';
   OuterEnumDefaultValue,
   OuterEnumInteger,
   OuterEnumIntegerDefaultValue,
+  OuterObjectWithEnumProperty,
   Pet,
   ReadOnlyFirst,
   SpecialModelName,
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml
index f45f5e128cc5..cd7cef8cc4fa 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pubspec.yaml
@@ -2,13 +2,13 @@ name: openapi
 version: 1.0.0
 description: OpenAPI API client
 environment:
-    sdk: ">=2.7.0 <3.0.0"
+    sdk: '>=2.7.0 <3.0.0'
 dependencies:
     dio: ^3.0.9
-    built_value: ">=7.1.0 <9.0.0"
-    built_collection: ">=4.3.2 <6.0.0"
+    built_value: '>=7.1.0 <8.0.0'
+    built_collection: '>=4.3.2 <5.0.0'
 dev_dependencies:
-    built_value_generator: ">=7.1.0 <9.0.0"
+    built_value_generator: '>=7.1.0 <8.0.0'
     build_runner: ^1.7.1
-    test: ">=1.3.0 <1.16.0"
+    test: '>=1.3.0 <1.16.0'
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart
new file mode 100644
index 000000000000..4b75616d133d
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart
@@ -0,0 +1,18 @@
+import 'package:openapi/model/outer_object_with_enum_property.dart';
+import 'package:test/test.dart';
+
+// tests for OuterObjectWithEnumProperty
+void main() {
+  final instance = OuterObjectWithEnumPropertyBuilder();
+  // TODO add properties to the builder and call build()
+
+  group(OuterObjectWithEnumProperty, () {
+    // OuterEnumInteger value
+    test('to test the property `value`', () async {
+      // TODO
+    });
+
+
+  });
+
+}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/pubspec.yaml b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/pubspec.yaml
index 33a734cd0533..0bf2e1272b0a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/pubspec.yaml
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake_tests/pubspec.yaml
@@ -6,8 +6,8 @@ environment:
   sdk: ">=2.10.0 <3.0.0"
 
 dev_dependencies:
-  built_collection: ">=4.3.2 <6.0.0"
-  built_value: ">=7.1.0 <9.0.0"
+  built_collection: ">=4.3.2 <5.0.0"
+  built_value: ">=7.1.0 <8.0.0"
   dio: 3.0.10
 #  http_mock_adapter: 0.1.5
   http_mock_adapter:
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
index f0d8178af255..2f9bc5863807 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/pet_api.dart
@@ -29,7 +29,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -81,8 +81,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
-    }
-    return null;
+        }
+    return Future<Pet>.value(null);
   }
 
   /// Deletes a pet
@@ -101,7 +101,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -173,7 +173,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: status');
     }
 
-    final path = '/pet/findByStatus';
+    final path = r'/pet/findByStatus';
 
     Object postBody;
 
@@ -232,7 +232,7 @@ class PetApi {
         .cast<Pet>()
         .toList(growable: false);
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Finds Pets by tags
@@ -251,7 +251,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: tags');
     }
 
-    final path = '/pet/findByTags';
+    final path = r'/pet/findByTags';
 
     Object postBody;
 
@@ -310,7 +310,7 @@ class PetApi {
         .cast<Pet>()
         .toList(growable: false);
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Find pet by ID
@@ -329,7 +329,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -384,8 +384,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
-    }
-    return null;
+        }
+    return Future<Pet>.value(null);
   }
 
   /// Update an existing pet
@@ -402,7 +402,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -454,8 +454,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
-    }
-    return null;
+        }
+    return Future<Pet>.value(null);
   }
 
   /// Updates a pet in the store with form data
@@ -478,7 +478,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -568,7 +568,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}/uploadImage'
+    final path = r'/pet/{petId}/uploadImage'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -639,7 +639,7 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
-    }
-    return null;
+        }
+    return Future<ApiResponse>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
index 121395c60f04..76ffaec6faad 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/store_api.dart
@@ -31,7 +31,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{orderId}'
+    final path = r'/store/order/{orderId}'
       .replaceAll('{' + 'orderId' + '}', orderId.toString());
 
     Object postBody;
@@ -89,7 +89,7 @@ class StoreApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getInventoryWithHttpInfo() async {
-    final path = '/store/inventory';
+    final path = r'/store/inventory';
 
     Object postBody;
 
@@ -139,7 +139,7 @@ class StoreApi {
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
     }
-    return null;
+    return Future<Map<String, int>>.value(null);
   }
 
   /// Find purchase order by ID
@@ -158,7 +158,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{orderId}'
+    final path = r'/store/order/{orderId}'
       .replaceAll('{' + 'orderId' + '}', orderId.toString());
 
     Object postBody;
@@ -213,8 +213,8 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 
   /// Place an order for a pet
@@ -231,7 +231,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: order');
     }
 
-    final path = '/store/order';
+    final path = r'/store/order';
 
     Object postBody = order;
 
@@ -283,7 +283,7 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
index 156dcc272a50..08847cc2b07d 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api/user_api.dart
@@ -31,7 +31,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user';
+    final path = r'/user';
 
     Object postBody = user;
 
@@ -96,7 +96,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithArray';
+    final path = r'/user/createWithArray';
 
     Object postBody = user;
 
@@ -159,7 +159,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithList';
+    final path = r'/user/createWithList';
 
     Object postBody = user;
 
@@ -224,7 +224,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -290,7 +290,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -343,8 +343,8 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
-    }
-    return null;
+        }
+    return Future<User>.value(null);
   }
 
   /// Logs user into the system
@@ -367,7 +367,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: password');
     }
 
-    final path = '/user/login';
+    final path = r'/user/login';
 
     Object postBody;
 
@@ -425,15 +425,15 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
-    }
-    return null;
+        }
+    return Future<String>.value(null);
   }
 
   /// Logs out current logged in user session
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> logoutUserWithHttpInfo() async {
-    final path = '/user/logout';
+    final path = r'/user/logout';
 
     Object postBody;
 
@@ -499,7 +499,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody = user;
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
index 9f875dba12d6..87a7a36d470b 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
@@ -49,17 +49,6 @@ class ApiClient {
   Map<String, Authentication> get authentications =>
       Map.unmodifiable(_authentications);
 
-  dynamic deserialize(String json, String targetType, {bool growable}) {
-    // Remove all spaces.  Necessary for reg expressions as well.
-    targetType = targetType.replaceAll(' ', '');
-
-    return targetType == 'String'
-      ? json
-      : _deserialize(jsonDecode(json), targetType, growable: true == growable);
-  }
-
-  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
-
   T getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
@@ -209,6 +198,17 @@ class ApiClient {
     throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);
   }
 
+  dynamic deserialize(String json, String targetType, {bool growable}) {
+    // Remove all spaces.  Necessary for reg expressions as well.
+    targetType = targetType.replaceAll(' ', '');
+
+  return targetType == 'String'
+    ? json
+    : _deserialize(jsonDecode(json), targetType, growable: true == growable);
+  }
+
+  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
+
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
   void _updateParamsForAuth(
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
index ef5de1dfbd02..80d5a3a8fc85 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/.openapi-generator/FILES
@@ -43,6 +43,7 @@ doc/OuterEnum.md
 doc/OuterEnumDefaultValue.md
 doc/OuterEnumInteger.md
 doc/OuterEnumIntegerDefaultValue.md
+doc/OuterObjectWithEnumProperty.md
 doc/Pet.md
 doc/PetApi.md
 doc/ReadOnlyFirst.md
@@ -106,6 +107,7 @@ lib/model/outer_enum.dart
 lib/model/outer_enum_default_value.dart
 lib/model/outer_enum_integer.dart
 lib/model/outer_enum_integer_default_value.dart
+lib/model/outer_object_with_enum_property.dart
 lib/model/pet.dart
 lib/model/read_only_first.dart
 lib/model/special_model_name.dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
index 6e050e1ead82..fe39c2f21264 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/README.md
@@ -66,6 +66,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterCompositeSerialize**](doc//FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](doc//FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](doc//FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**fakePropertyEnumIntegerSerialize**](doc//FakeApi.md#fakepropertyenumintegerserialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**testBodyWithFileSchema**](doc//FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](doc//FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](doc//FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
@@ -139,6 +140,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumDefaultValue](doc//OuterEnumDefaultValue.md)
  - [OuterEnumInteger](doc//OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](doc//OuterEnumIntegerDefaultValue.md)
+ - [OuterObjectWithEnumProperty](doc//OuterObjectWithEnumProperty.md)
  - [Pet](doc//Pet.md)
  - [ReadOnlyFirst](doc//ReadOnlyFirst.md)
  - [SpecialModelName](doc//SpecialModelName.md)
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
index d8dfaf9329cd..1a42d2f9341a 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/FakeApi.md
@@ -15,6 +15,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
@@ -279,6 +280,49 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **fakePropertyEnumIntegerSerialize**
+> OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = FakeApi();
+final outerObjectWithEnumProperty = OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+
+try { 
+    final result = api_instance.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
+    print(result);
+} catch (e) {
+    print('Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: */*
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **testBodyWithFileSchema**
 > testBodyWithFileSchema(fileSchemaTestClass)
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..eab2ae8f66b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/OuterObjectWithEnumProperty.md
@@ -0,0 +1,15 @@
+# openapi.model.OuterObjectWithEnumProperty
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
index b54bf96e1882..d68dcf2e279e 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api.dart
@@ -73,6 +73,7 @@ part 'model/outer_enum.dart';
 part 'model/outer_enum_default_value.dart';
 part 'model/outer_enum_integer.dart';
 part 'model/outer_enum_integer_default_value.dart';
+part 'model/outer_object_with_enum_property.dart';
 part 'model/pet.dart';
 part 'model/read_only_first.dart';
 part 'model/special_model_name.dart';
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/another_fake_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/another_fake_api.dart
index cdf8eb623c9b..4dbc722ac178 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/another_fake_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/another_fake_api.dart
@@ -31,7 +31,7 @@ class AnotherFakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/another-fake/dummy';
+    final path = r'/another-fake/dummy';
 
     Object postBody = modelClient;
 
@@ -85,7 +85,7 @@ class AnotherFakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
-    }
-    return null;
+        }
+    return Future<ModelClient>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/default_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/default_api.dart
index 24fba9d8349e..a75bdc33448e 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/default_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/default_api.dart
@@ -17,7 +17,7 @@ class DefaultApi {
 
   /// Performs an HTTP 'GET /foo' operation and returns the [Response].
   Future<Response> fooGetWithHttpInfo() async {
-    final path = '/foo';
+    final path = r'/foo';
 
     Object postBody;
 
@@ -63,7 +63,7 @@ class DefaultApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'InlineResponseDefault') as InlineResponseDefault;
-    }
-    return null;
+        }
+    return Future<InlineResponseDefault>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
index e81da089940d..d25c1bcd4a5e 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_api.dart
@@ -19,7 +19,7 @@ class FakeApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> fakeHealthGetWithHttpInfo() async {
-    final path = '/fake/health';
+    final path = r'/fake/health';
 
     Object postBody;
 
@@ -66,8 +66,8 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'HealthCheckResult') as HealthCheckResult;
-    }
-    return null;
+        }
+    return Future<HealthCheckResult>.value(null);
   }
 
   /// test http signature authentication
@@ -90,7 +90,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/fake/http-signature-test';
+    final path = r'/fake/http-signature-test';
 
     Object postBody = pet;
 
@@ -164,7 +164,7 @@ class FakeApi {
   Future<Response> fakeOuterBooleanSerializeWithHttpInfo({ bool body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/boolean';
+    final path = r'/fake/outer/boolean';
 
     Object postBody = body;
 
@@ -216,8 +216,8 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'bool') as bool;
-    }
-    return null;
+        }
+    return Future<bool>.value(null);
   }
 
   /// Test serialization of object with outer number type
@@ -231,7 +231,7 @@ class FakeApi {
   Future<Response> fakeOuterCompositeSerializeWithHttpInfo({ OuterComposite outerComposite }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/composite';
+    final path = r'/fake/outer/composite';
 
     Object postBody = outerComposite;
 
@@ -283,8 +283,8 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'OuterComposite') as OuterComposite;
-    }
-    return null;
+        }
+    return Future<OuterComposite>.value(null);
   }
 
   /// Test serialization of outer number types
@@ -298,7 +298,7 @@ class FakeApi {
   Future<Response> fakeOuterNumberSerializeWithHttpInfo({ num body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/number';
+    final path = r'/fake/outer/number';
 
     Object postBody = body;
 
@@ -350,8 +350,8 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'num') as num;
-    }
-    return null;
+        }
+    return Future<num>.value(null);
   }
 
   /// Test serialization of outer string types
@@ -365,7 +365,7 @@ class FakeApi {
   Future<Response> fakeOuterStringSerializeWithHttpInfo({ String body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/string';
+    final path = r'/fake/outer/string';
 
     Object postBody = body;
 
@@ -417,8 +417,78 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
+        }
+    return Future<String>.value(null);
+  }
+
+  /// Test serialization of enum (int) properties with examples
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [OuterObjectWithEnumProperty] outerObjectWithEnumProperty (required):
+  ///   Input enum (int) as post body
+  Future<Response> fakePropertyEnumIntegerSerializeWithHttpInfo(OuterObjectWithEnumProperty outerObjectWithEnumProperty) async {
+    // Verify required params are set.
+    if (outerObjectWithEnumProperty == null) {
+     throw ApiException(HttpStatus.badRequest, 'Missing required param: outerObjectWithEnumProperty');
     }
-    return null;
+
+    final path = r'/fake/property/enum-int';
+
+    Object postBody = outerObjectWithEnumProperty;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    final contentTypes = <String>['application/json'];
+    final nullableContentType = contentTypes.isNotEmpty ? contentTypes[0] : null;
+    final authNames = <String>[];
+
+    if (
+      nullableContentType != null &&
+      nullableContentType.toLowerCase().startsWith('multipart/form-data')
+    ) {
+      bool hasFields = false;
+      final mp = MultipartRequest(null, null);
+      if (hasFields) {
+        postBody = mp;
+      }
+    } else {
+    }
+
+    return await apiClient.invokeAPI(
+      path,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      nullableContentType,
+      authNames,
+    );
+  }
+
+  /// Test serialization of enum (int) properties with examples
+  ///
+  /// Parameters:
+  ///
+  /// * [OuterObjectWithEnumProperty] outerObjectWithEnumProperty (required):
+  ///   Input enum (int) as post body
+  Future<OuterObjectWithEnumProperty> fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty) async {
+    final response = await fakePropertyEnumIntegerSerializeWithHttpInfo(outerObjectWithEnumProperty);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body != null && response.statusCode != HttpStatus.noContent) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'OuterObjectWithEnumProperty') as OuterObjectWithEnumProperty;
+        }
+    return Future<OuterObjectWithEnumProperty>.value(null);
   }
 
   /// For this test, the body for this request much reference a schema named `File`.
@@ -434,7 +504,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: fileSchemaTestClass');
     }
 
-    final path = '/fake/body-with-file-schema';
+    final path = r'/fake/body-with-file-schema';
 
     Object postBody = fileSchemaTestClass;
 
@@ -497,7 +567,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/fake/body-with-query-params';
+    final path = r'/fake/body-with-query-params';
 
     Object postBody = user;
 
@@ -563,7 +633,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody = modelClient;
 
@@ -617,8 +687,8 @@ class FakeApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
-    }
-    return null;
+        }
+    return Future<ModelClient>.value(null);
   }
 
   /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -685,7 +755,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: byte');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -905,7 +975,7 @@ class FakeApi {
   Future<Response> testEnumParametersWithHttpInfo({ List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, int enumQueryInteger, double enumQueryDouble, List<String> enumFormStringArray, String enumFormString }) async {
     // Verify required params are set.
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -1048,7 +1118,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requiredInt64Group');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -1142,7 +1212,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requestBody');
     }
 
-    final path = '/fake/inline-additionalProperties';
+    final path = r'/fake/inline-additionalProperties';
 
     Object postBody = requestBody;
 
@@ -1211,7 +1281,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: param2');
     }
 
-    final path = '/fake/jsonFormData';
+    final path = r'/fake/jsonFormData';
 
     Object postBody;
 
@@ -1310,7 +1380,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: context');
     }
 
-    final path = '/fake/test-query-paramters';
+    final path = r'/fake/test-query-paramters';
 
     Object postBody;
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_classname_tags123_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_classname_tags123_api.dart
index 66a5c292f0c6..0455f4c68f05 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_classname_tags123_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/fake_classname_tags123_api.dart
@@ -31,7 +31,7 @@ class FakeClassnameTags123Api {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/fake_classname_test';
+    final path = r'/fake_classname_test';
 
     Object postBody = modelClient;
 
@@ -85,7 +85,7 @@ class FakeClassnameTags123Api {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
-    }
-    return null;
+        }
+    return Future<ModelClient>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/pet_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/pet_api.dart
index 71abeecfdd9c..eacebcceace3 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/pet_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/pet_api.dart
@@ -29,7 +29,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -94,7 +94,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -166,7 +166,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: status');
     }
 
-    final path = '/pet/findByStatus';
+    final path = r'/pet/findByStatus';
 
     Object postBody;
 
@@ -225,7 +225,7 @@ class PetApi {
         .cast<Pet>()
         .toList(growable: false);
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Finds Pets by tags
@@ -244,7 +244,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: tags');
     }
 
-    final path = '/pet/findByTags';
+    final path = r'/pet/findByTags';
 
     Object postBody;
 
@@ -303,7 +303,7 @@ class PetApi {
         .cast<Pet>()
         .toSet();
     }
-    return null;
+    return Future<Set<Pet>>.value(null);
   }
 
   /// Find pet by ID
@@ -322,7 +322,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -377,8 +377,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
-    }
-    return null;
+        }
+    return Future<Pet>.value(null);
   }
 
   /// Update an existing pet
@@ -395,7 +395,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -464,7 +464,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -554,7 +554,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}/uploadImage'
+    final path = r'/pet/{petId}/uploadImage'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -625,8 +625,8 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
-    }
-    return null;
+        }
+    return Future<ApiResponse>.value(null);
   }
 
   /// uploads an image (required)
@@ -652,7 +652,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requiredFile');
     }
 
-    final path = '/fake/{petId}/uploadImageWithRequiredFile'
+    final path = r'/fake/{petId}/uploadImageWithRequiredFile'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -723,7 +723,7 @@ class PetApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
-    }
-    return null;
+        }
+    return Future<ApiResponse>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
index bf83f6a25231..91d115d44c83 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/store_api.dart
@@ -31,7 +31,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{order_id}'
+    final path = r'/store/order/{order_id}'
       .replaceAll('{' + 'order_id' + '}', orderId.toString());
 
     Object postBody;
@@ -89,7 +89,7 @@ class StoreApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getInventoryWithHttpInfo() async {
-    final path = '/store/inventory';
+    final path = r'/store/inventory';
 
     Object postBody;
 
@@ -139,7 +139,7 @@ class StoreApi {
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
     }
-    return null;
+    return Future<Map<String, int>>.value(null);
   }
 
   /// Find purchase order by ID
@@ -158,7 +158,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{order_id}'
+    final path = r'/store/order/{order_id}'
       .replaceAll('{' + 'order_id' + '}', orderId.toString());
 
     Object postBody;
@@ -213,8 +213,8 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 
   /// Place an order for a pet
@@ -231,7 +231,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: order');
     }
 
-    final path = '/store/order';
+    final path = r'/store/order';
 
     Object postBody = order;
 
@@ -283,7 +283,7 @@ class StoreApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
-    }
-    return null;
+        }
+    return Future<Order>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/user_api.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/user_api.dart
index 76d477efeb36..05ce7f9dec15 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/user_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api/user_api.dart
@@ -31,7 +31,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user';
+    final path = r'/user';
 
     Object postBody = user;
 
@@ -96,7 +96,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithArray';
+    final path = r'/user/createWithArray';
 
     Object postBody = user;
 
@@ -159,7 +159,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithList';
+    final path = r'/user/createWithList';
 
     Object postBody = user;
 
@@ -224,7 +224,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -290,7 +290,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -343,8 +343,8 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
-    }
-    return null;
+        }
+    return Future<User>.value(null);
   }
 
   /// Logs user into the system
@@ -367,7 +367,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: password');
     }
 
-    final path = '/user/login';
+    final path = r'/user/login';
 
     Object postBody;
 
@@ -425,15 +425,15 @@ class UserApi {
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
       return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
-    }
-    return null;
+        }
+    return Future<String>.value(null);
   }
 
   /// Logs out current logged in user session
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> logoutUserWithHttpInfo() async {
-    final path = '/user/logout';
+    final path = r'/user/logout';
 
     Object postBody;
 
@@ -499,7 +499,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody = user;
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
index 864e189b21a4..83da5a1e4829 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
@@ -52,17 +52,6 @@ class ApiClient {
   Map<String, Authentication> get authentications =>
       Map.unmodifiable(_authentications);
 
-  dynamic deserialize(String json, String targetType, {bool growable}) {
-    // Remove all spaces.  Necessary for reg expressions as well.
-    targetType = targetType.replaceAll(' ', '');
-
-    return targetType == 'String'
-      ? json
-      : _deserialize(jsonDecode(json), targetType, growable: true == growable);
-  }
-
-  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
-
   T getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
@@ -252,6 +241,8 @@ class ApiClient {
         case 'OuterEnumIntegerDefaultValue':
           return OuterEnumIntegerDefaultValueTypeTransformer().decode(value);
           
+        case 'OuterObjectWithEnumProperty':
+          return OuterObjectWithEnumProperty.fromJson(value);
         case 'Pet':
           return Pet.fromJson(value);
         case 'ReadOnlyFirst':
@@ -291,6 +282,17 @@ class ApiClient {
     throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);
   }
 
+  dynamic deserialize(String json, String targetType, {bool growable}) {
+    // Remove all spaces.  Necessary for reg expressions as well.
+    targetType = targetType.replaceAll(' ', '');
+
+  return targetType == 'String'
+    ? json
+    : _deserialize(jsonDecode(json), targetType, growable: true == growable);
+  }
+
+  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
+
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
   void _updateParamsForAuth(
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_helper.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_helper.dart
index d307b920991d..ececff49c4c8 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_helper.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_helper.dart
@@ -60,23 +60,18 @@ String parameterToString(dynamic value) {
   }
   if (value is EnumClass) {
     return EnumClassTypeTransformer().encode(value).toString();
-
   }
   if (value is OuterEnum) {
     return OuterEnumTypeTransformer().encode(value).toString();
-
   }
   if (value is OuterEnumDefaultValue) {
     return OuterEnumDefaultValueTypeTransformer().encode(value).toString();
-
   }
   if (value is OuterEnumInteger) {
     return OuterEnumIntegerTypeTransformer().encode(value).toString();
-
   }
   if (value is OuterEnumIntegerDefaultValue) {
     return OuterEnumIntegerDefaultValueTypeTransformer().encode(value).toString();
-
   }
   return value.toString();
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart
new file mode 100644
index 000000000000..4d58d2762844
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/outer_object_with_enum_property.dart
@@ -0,0 +1,69 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.0
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class OuterObjectWithEnumProperty {
+  /// Returns a new [OuterObjectWithEnumProperty] instance.
+  OuterObjectWithEnumProperty({
+    @required this.value,
+  });
+
+  OuterEnumInteger value;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is OuterObjectWithEnumProperty &&
+     other.value == value;
+
+  @override
+  int get hashCode =>
+    (value == null ? 0 : value.hashCode);
+
+  @override
+  String toString() => 'OuterObjectWithEnumProperty[value=$value]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'value'] = value;
+    return json;
+  }
+
+  /// Returns a new [OuterObjectWithEnumProperty] instance and imports its values from
+  /// [json] if it's non-null, null if [json] is null.
+  static OuterObjectWithEnumProperty fromJson(Map<String, dynamic> json) => json == null
+    ? null
+    : OuterObjectWithEnumProperty(
+        value: OuterEnumInteger.fromJson(json[r'value']),
+    );
+
+  static List<OuterObjectWithEnumProperty> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
+    json == null || json.isEmpty
+      ? true == emptyIsNull ? null : <OuterObjectWithEnumProperty>[]
+      : json.map((v) => OuterObjectWithEnumProperty.fromJson(v)).toList(growable: true == growable);
+
+  static Map<String, OuterObjectWithEnumProperty> mapFromJson(Map<String, dynamic> json) {
+    final map = <String, OuterObjectWithEnumProperty>{};
+    if (json != null && json.isNotEmpty) {
+      json.forEach((String key, dynamic v) => map[key] = OuterObjectWithEnumProperty.fromJson(v));
+    }
+    return map;
+  }
+
+  // maps a json object with a list of OuterObjectWithEnumProperty-objects as value to a dart map
+  static Map<String, List<OuterObjectWithEnumProperty>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
+    final map = <String, List<OuterObjectWithEnumProperty>>{};
+    if (json != null && json.isNotEmpty) {
+      json.forEach((String key, dynamic v) {
+        map[key] = OuterObjectWithEnumProperty.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
+      });
+    }
+    return map;
+  }
+}
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart
new file mode 100644
index 000000000000..f7764334ed44
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/outer_object_with_enum_property_test.dart
@@ -0,0 +1,17 @@
+import 'package:openapi/api.dart';
+import 'package:test/test.dart';
+
+// tests for OuterObjectWithEnumProperty
+void main() {
+  final instance = OuterObjectWithEnumProperty();
+
+  group('test OuterObjectWithEnumProperty', () {
+    // OuterEnumInteger value
+    test('to test the property `value`', () async {
+      // TODO
+    });
+
+
+  });
+
+}
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/FILES b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/FILES
index 22ebe91a5204..a9cd914811bd 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/.openapi-generator/FILES
@@ -44,6 +44,7 @@ doc/OuterEnum.md
 doc/OuterEnumDefaultValue.md
 doc/OuterEnumInteger.md
 doc/OuterEnumIntegerDefaultValue.md
+doc/OuterObjectWithEnumProperty.md
 doc/Pet.md
 doc/PetApi.md
 doc/ReadOnlyFirst.md
@@ -107,6 +108,7 @@ lib/model/outer_enum.dart
 lib/model/outer_enum_default_value.dart
 lib/model/outer_enum_integer.dart
 lib/model/outer_enum_integer_default_value.dart
+lib/model/outer_object_with_enum_property.dart
 lib/model/pet.dart
 lib/model/read_only_first.dart
 lib/model/special_model_name.dart
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/README.md b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/README.md
index 6e050e1ead82..fe39c2f21264 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/README.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/README.md
@@ -66,6 +66,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterCompositeSerialize**](doc//FakeApi.md#fakeoutercompositeserialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fakeOuterNumberSerialize**](doc//FakeApi.md#fakeouternumberserialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](doc//FakeApi.md#fakeouterstringserialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**fakePropertyEnumIntegerSerialize**](doc//FakeApi.md#fakepropertyenumintegerserialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**testBodyWithFileSchema**](doc//FakeApi.md#testbodywithfileschema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**testBodyWithQueryParams**](doc//FakeApi.md#testbodywithqueryparams) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**testClientModel**](doc//FakeApi.md#testclientmodel) | **PATCH** /fake | To test \"client\" model
@@ -139,6 +140,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumDefaultValue](doc//OuterEnumDefaultValue.md)
  - [OuterEnumInteger](doc//OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](doc//OuterEnumIntegerDefaultValue.md)
+ - [OuterObjectWithEnumProperty](doc//OuterObjectWithEnumProperty.md)
  - [Pet](doc//Pet.md)
  - [ReadOnlyFirst](doc//ReadOnlyFirst.md)
  - [SpecialModelName](doc//SpecialModelName.md)
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/FakeApi.md b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/FakeApi.md
index d8dfaf9329cd..1a42d2f9341a 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/FakeApi.md
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/FakeApi.md
@@ -15,6 +15,7 @@ Method | HTTP request | Description
 [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
 [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**fakePropertyEnumIntegerSerialize**](FakeApi.md#fakePropertyEnumIntegerSerialize) | **POST** /fake/property/enum-int | 
 [**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
 [**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
 [**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \"client\" model
@@ -279,6 +280,49 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **fakePropertyEnumIntegerSerialize**
+> OuterObjectWithEnumProperty fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+final api_instance = FakeApi();
+final outerObjectWithEnumProperty = OuterObjectWithEnumProperty(); // OuterObjectWithEnumProperty | Input enum (int) as post body
+
+try { 
+    final result = api_instance.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty);
+    print(result);
+} catch (e) {
+    print('Exception when calling FakeApi->fakePropertyEnumIntegerSerialize: $e\n');
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outerObjectWithEnumProperty** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: */*
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **testBodyWithFileSchema**
 > testBodyWithFileSchema(fileSchemaTestClass)
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/OuterObjectWithEnumProperty.md b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..eab2ae8f66b4
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/doc/OuterObjectWithEnumProperty.md
@@ -0,0 +1,15 @@
+# openapi.model.OuterObjectWithEnumProperty
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api.dart
index de2aea295d76..9fdfdb55fb80 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api.dart
@@ -74,6 +74,7 @@ part 'model/outer_enum.dart';
 part 'model/outer_enum_default_value.dart';
 part 'model/outer_enum_integer.dart';
 part 'model/outer_enum_integer_default_value.dart';
+part 'model/outer_object_with_enum_property.dart';
 part 'model/pet.dart';
 part 'model/read_only_first.dart';
 part 'model/special_model_name.dart';
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/another_fake_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/another_fake_api.dart
index cdf8eb623c9b..29c7103abd37 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/another_fake_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/another_fake_api.dart
@@ -31,7 +31,7 @@ class AnotherFakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/another-fake/dummy';
+    final path = r'/another-fake/dummy';
 
     Object postBody = modelClient;
 
@@ -84,8 +84,9 @@ class AnotherFakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
+
+      return ModelClient.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<ModelClient>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/default_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/default_api.dart
index 24fba9d8349e..6295891cd3cc 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/default_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/default_api.dart
@@ -17,7 +17,7 @@ class DefaultApi {
 
   /// Performs an HTTP 'GET /foo' operation and returns the [Response].
   Future<Response> fooGetWithHttpInfo() async {
-    final path = '/foo';
+    final path = r'/foo';
 
     Object postBody;
 
@@ -62,8 +62,9 @@ class DefaultApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'InlineResponseDefault') as InlineResponseDefault;
+
+      return InlineResponseDefault.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<InlineResponseDefault>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_api.dart
index e81da089940d..21c888fa5889 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_api.dart
@@ -19,7 +19,7 @@ class FakeApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> fakeHealthGetWithHttpInfo() async {
-    final path = '/fake/health';
+    final path = r'/fake/health';
 
     Object postBody;
 
@@ -65,9 +65,10 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'HealthCheckResult') as HealthCheckResult;
+
+      return HealthCheckResult.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<HealthCheckResult>.value(null);
   }
 
   /// test http signature authentication
@@ -90,7 +91,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/fake/http-signature-test';
+    final path = r'/fake/http-signature-test';
 
     Object postBody = pet;
 
@@ -164,7 +165,7 @@ class FakeApi {
   Future<Response> fakeOuterBooleanSerializeWithHttpInfo({ bool body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/boolean';
+    final path = r'/fake/outer/boolean';
 
     Object postBody = body;
 
@@ -215,9 +216,10 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'bool') as bool;
+
+      return response.body as bool;
     }
-    return null;
+    return Future<bool>.value(null);
   }
 
   /// Test serialization of object with outer number type
@@ -231,7 +233,7 @@ class FakeApi {
   Future<Response> fakeOuterCompositeSerializeWithHttpInfo({ OuterComposite outerComposite }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/composite';
+    final path = r'/fake/outer/composite';
 
     Object postBody = outerComposite;
 
@@ -282,9 +284,10 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'OuterComposite') as OuterComposite;
+
+      return OuterComposite.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<OuterComposite>.value(null);
   }
 
   /// Test serialization of outer number types
@@ -298,7 +301,7 @@ class FakeApi {
   Future<Response> fakeOuterNumberSerializeWithHttpInfo({ num body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/number';
+    final path = r'/fake/outer/number';
 
     Object postBody = body;
 
@@ -349,9 +352,10 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'num') as num;
+
+      return response.body as num;
     }
-    return null;
+    return Future<num>.value(null);
   }
 
   /// Test serialization of outer string types
@@ -365,7 +369,7 @@ class FakeApi {
   Future<Response> fakeOuterStringSerializeWithHttpInfo({ String body }) async {
     // Verify required params are set.
 
-    final path = '/fake/outer/string';
+    final path = r'/fake/outer/string';
 
     Object postBody = body;
 
@@ -416,9 +420,81 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
+
+      return response.body as String;
     }
-    return null;
+    return Future<String>.value(null);
+  }
+
+  /// Test serialization of enum (int) properties with examples
+  ///
+  /// Note: This method returns the HTTP [Response].
+  ///
+  /// Parameters:
+  ///
+  /// * [OuterObjectWithEnumProperty] outerObjectWithEnumProperty (required):
+  ///   Input enum (int) as post body
+  Future<Response> fakePropertyEnumIntegerSerializeWithHttpInfo(OuterObjectWithEnumProperty outerObjectWithEnumProperty) async {
+    // Verify required params are set.
+    if (outerObjectWithEnumProperty == null) {
+     throw ApiException(HttpStatus.badRequest, 'Missing required param: outerObjectWithEnumProperty');
+    }
+
+    final path = r'/fake/property/enum-int';
+
+    Object postBody = outerObjectWithEnumProperty;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+    final contentTypes = <String>['application/json'];
+    final nullableContentType = contentTypes.isNotEmpty ? contentTypes[0] : null;
+    final authNames = <String>[];
+
+    if (
+      nullableContentType != null &&
+      nullableContentType.toLowerCase().startsWith('multipart/form-data')
+    ) {
+      bool hasFields = false;
+      final mp = MultipartRequest(null, null);
+      if (hasFields) {
+        postBody = mp;
+      }
+    } else {
+    }
+
+    return await apiClient.invokeAPI(
+      path,
+      'POST',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      nullableContentType,
+      authNames,
+    );
+  }
+
+  /// Test serialization of enum (int) properties with examples
+  ///
+  /// Parameters:
+  ///
+  /// * [OuterObjectWithEnumProperty] outerObjectWithEnumProperty (required):
+  ///   Input enum (int) as post body
+  Future<OuterObjectWithEnumProperty> fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty) async {
+    final response = await fakePropertyEnumIntegerSerializeWithHttpInfo(outerObjectWithEnumProperty);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body != null && response.statusCode != HttpStatus.noContent) {
+
+      return OuterObjectWithEnumProperty.fromJson(json.decode(response.body));
+    }
+    return Future<OuterObjectWithEnumProperty>.value(null);
   }
 
   /// For this test, the body for this request much reference a schema named `File`.
@@ -434,7 +510,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: fileSchemaTestClass');
     }
 
-    final path = '/fake/body-with-file-schema';
+    final path = r'/fake/body-with-file-schema';
 
     Object postBody = fileSchemaTestClass;
 
@@ -497,7 +573,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/fake/body-with-query-params';
+    final path = r'/fake/body-with-query-params';
 
     Object postBody = user;
 
@@ -563,7 +639,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody = modelClient;
 
@@ -616,9 +692,10 @@ class FakeApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
+
+      return ModelClient.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<ModelClient>.value(null);
   }
 
   /// Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -685,7 +762,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: byte');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -905,7 +982,7 @@ class FakeApi {
   Future<Response> testEnumParametersWithHttpInfo({ List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, int enumQueryInteger, double enumQueryDouble, List<String> enumFormStringArray, String enumFormString }) async {
     // Verify required params are set.
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -1048,7 +1125,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requiredInt64Group');
     }
 
-    final path = '/fake';
+    final path = r'/fake';
 
     Object postBody;
 
@@ -1142,7 +1219,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requestBody');
     }
 
-    final path = '/fake/inline-additionalProperties';
+    final path = r'/fake/inline-additionalProperties';
 
     Object postBody = requestBody;
 
@@ -1211,7 +1288,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: param2');
     }
 
-    final path = '/fake/jsonFormData';
+    final path = r'/fake/jsonFormData';
 
     Object postBody;
 
@@ -1310,7 +1387,7 @@ class FakeApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: context');
     }
 
-    final path = '/fake/test-query-paramters';
+    final path = r'/fake/test-query-paramters';
 
     Object postBody;
 
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_classname_tags123_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_classname_tags123_api.dart
index 66a5c292f0c6..dc0b394f8fb9 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_classname_tags123_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/fake_classname_tags123_api.dart
@@ -31,7 +31,7 @@ class FakeClassnameTags123Api {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: modelClient');
     }
 
-    final path = '/fake_classname_test';
+    final path = r'/fake_classname_test';
 
     Object postBody = modelClient;
 
@@ -84,8 +84,9 @@ class FakeClassnameTags123Api {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'ModelClient') as ModelClient;
+
+      return ModelClient.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<ModelClient>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/pet_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/pet_api.dart
index 71abeecfdd9c..6c43311b2e8f 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/pet_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/pet_api.dart
@@ -29,7 +29,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -94,7 +94,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -166,7 +166,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: status');
     }
 
-    final path = '/pet/findByStatus';
+    final path = r'/pet/findByStatus';
 
     Object postBody;
 
@@ -221,11 +221,12 @@ class PetApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List)
-        .cast<Pet>()
-        .toList(growable: false);
+
+      return (json.decode(response.body) as List)
+        .map((i) => Pet.fromJson(i))
+        .toList();
     }
-    return null;
+    return Future<List<Pet>>.value(null);
   }
 
   /// Finds Pets by tags
@@ -244,7 +245,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: tags');
     }
 
-    final path = '/pet/findByTags';
+    final path = r'/pet/findByTags';
 
     Object postBody;
 
@@ -299,11 +300,12 @@ class PetApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return (apiClient.deserialize(_decodeBodyBytes(response), 'Set<Pet>') as List)
-        .cast<Pet>()
+
+      return (json.decode(response.body) as List)
+        .map((i) => Pet.fromJson(i))
         .toSet();
     }
-    return null;
+    return Future<Set<Pet>>.value(null);
   }
 
   /// Find pet by ID
@@ -322,7 +324,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -376,9 +378,10 @@ class PetApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
+
+      return Pet.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<Pet>.value(null);
   }
 
   /// Update an existing pet
@@ -395,7 +398,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: pet');
     }
 
-    final path = '/pet';
+    final path = r'/pet';
 
     Object postBody = pet;
 
@@ -464,7 +467,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}'
+    final path = r'/pet/{petId}'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -554,7 +557,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: petId');
     }
 
-    final path = '/pet/{petId}/uploadImage'
+    final path = r'/pet/{petId}/uploadImage'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -624,9 +627,10 @@ class PetApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
+
+      return ApiResponse.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<ApiResponse>.value(null);
   }
 
   /// uploads an image (required)
@@ -652,7 +656,7 @@ class PetApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: requiredFile');
     }
 
-    final path = '/fake/{petId}/uploadImageWithRequiredFile'
+    final path = r'/fake/{petId}/uploadImageWithRequiredFile'
       .replaceAll('{' + 'petId' + '}', petId.toString());
 
     Object postBody;
@@ -722,8 +726,9 @@ class PetApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
+
+      return ApiResponse.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<ApiResponse>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/store_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/store_api.dart
index bf83f6a25231..dd5c2db3528e 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/store_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/store_api.dart
@@ -31,7 +31,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{order_id}'
+    final path = r'/store/order/{order_id}'
       .replaceAll('{' + 'order_id' + '}', orderId.toString());
 
     Object postBody;
@@ -89,7 +89,7 @@ class StoreApi {
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> getInventoryWithHttpInfo() async {
-    final path = '/store/inventory';
+    final path = r'/store/inventory';
 
     Object postBody;
 
@@ -137,9 +137,10 @@ class StoreApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
+
+      return Map<String, int>.from(json.decode(response.body));
     }
-    return null;
+    return Future<Map<String, int>>.value(null);
   }
 
   /// Find purchase order by ID
@@ -158,7 +159,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: orderId');
     }
 
-    final path = '/store/order/{order_id}'
+    final path = r'/store/order/{order_id}'
       .replaceAll('{' + 'order_id' + '}', orderId.toString());
 
     Object postBody;
@@ -212,9 +213,10 @@ class StoreApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
+
+      return Order.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<Order>.value(null);
   }
 
   /// Place an order for a pet
@@ -231,7 +233,7 @@ class StoreApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: order');
     }
 
-    final path = '/store/order';
+    final path = r'/store/order';
 
     Object postBody = order;
 
@@ -282,8 +284,9 @@ class StoreApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
+
+      return Order.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<Order>.value(null);
   }
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/user_api.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/user_api.dart
index 76d477efeb36..ba21021c9ddb 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/user_api.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api/user_api.dart
@@ -31,7 +31,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user';
+    final path = r'/user';
 
     Object postBody = user;
 
@@ -96,7 +96,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithArray';
+    final path = r'/user/createWithArray';
 
     Object postBody = user;
 
@@ -159,7 +159,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/createWithList';
+    final path = r'/user/createWithList';
 
     Object postBody = user;
 
@@ -224,7 +224,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -290,7 +290,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: username');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody;
@@ -342,9 +342,10 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
+
+      return User.fromJson(json.decode(response.body));
     }
-    return null;
+    return Future<User>.value(null);
   }
 
   /// Logs user into the system
@@ -367,7 +368,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: password');
     }
 
-    final path = '/user/login';
+    final path = r'/user/login';
 
     Object postBody;
 
@@ -424,16 +425,17 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body != null && response.statusCode != HttpStatus.noContent) {
-      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
+
+      return response.body as String;
     }
-    return null;
+    return Future<String>.value(null);
   }
 
   /// Logs out current logged in user session
   ///
   /// Note: This method returns the HTTP [Response].
   Future<Response> logoutUserWithHttpInfo() async {
-    final path = '/user/logout';
+    final path = r'/user/logout';
 
     Object postBody;
 
@@ -499,7 +501,7 @@ class UserApi {
      throw ApiException(HttpStatus.badRequest, 'Missing required param: user');
     }
 
-    final path = '/user/{username}'
+    final path = r'/user/{username}'
       .replaceAll('{' + 'username' + '}', username.toString());
 
     Object postBody = user;
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart
index 435fdfc4b74a..593d552210b5 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart
@@ -52,17 +52,6 @@ class ApiClient {
   Map<String, Authentication> get authentications =>
       Map.unmodifiable(_authentications);
 
-  dynamic deserialize(String json, String targetType, {bool growable}) {
-    // Remove all spaces.  Necessary for reg expressions as well.
-    targetType = targetType.replaceAll(' ', '');
-
-    return targetType == 'String'
-      ? json
-      : _deserialize(jsonDecode(json), targetType, growable: true == growable);
-  }
-
-  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
-
   T getAuthentication<T extends Authentication>(String name) {
     final authentication = _authentications[name];
     return authentication is T ? authentication : null;
@@ -155,141 +144,8 @@ class ApiClient {
     throw ApiException(HttpStatus.badRequest, 'Invalid HTTP operation: $method $path',);
   }
 
-  dynamic _deserialize(dynamic value, String targetType, {bool growable}) {
-    try {
-      switch (targetType) {
-        case 'String':
-          return '$value';
-        case 'int':
-          return value is int ? value : int.parse('$value');
-        case 'bool':
-          if (value is bool) {
-            return value;
-          }
-          final valueString = '$value'.toLowerCase();
-          return valueString == 'true' || valueString == '1';
-          break;
-        case 'double':
-          return value is double ? value : double.parse('$value');
-        case 'AdditionalPropertiesClass':
-          return AdditionalPropertiesClass.fromJson(value);
-        case 'Animal':
-          return Animal.fromJson(value);
-        case 'ApiResponse':
-          return ApiResponse.fromJson(value);
-        case 'ArrayOfArrayOfNumberOnly':
-          return ArrayOfArrayOfNumberOnly.fromJson(value);
-        case 'ArrayOfNumberOnly':
-          return ArrayOfNumberOnly.fromJson(value);
-        case 'ArrayTest':
-          return ArrayTest.fromJson(value);
-        case 'Capitalization':
-          return Capitalization.fromJson(value);
-        case 'Cat':
-          return Cat.fromJson(value);
-        case 'CatAllOf':
-          return CatAllOf.fromJson(value);
-        case 'Category':
-          return Category.fromJson(value);
-        case 'ClassModel':
-          return ClassModel.fromJson(value);
-        case 'Dog':
-          return Dog.fromJson(value);
-        case 'DogAllOf':
-          return DogAllOf.fromJson(value);
-        case 'EnumArrays':
-          return EnumArrays.fromJson(value);
-        case 'EnumClass':
-          
-           return _$enumDecode(_$EnumClassEnumMap, value);
-        case 'EnumTest':
-          return EnumTest.fromJson(value);
-        case 'FileSchemaTestClass':
-          return FileSchemaTestClass.fromJson(value);
-        case 'Foo':
-          return Foo.fromJson(value);
-        case 'FormatTest':
-          return FormatTest.fromJson(value);
-        case 'HasOnlyReadOnly':
-          return HasOnlyReadOnly.fromJson(value);
-        case 'HealthCheckResult':
-          return HealthCheckResult.fromJson(value);
-        case 'InlineResponseDefault':
-          return InlineResponseDefault.fromJson(value);
-        case 'MapTest':
-          return MapTest.fromJson(value);
-        case 'MixedPropertiesAndAdditionalPropertiesClass':
-          return MixedPropertiesAndAdditionalPropertiesClass.fromJson(value);
-        case 'Model200Response':
-          return Model200Response.fromJson(value);
-        case 'ModelClient':
-          return ModelClient.fromJson(value);
-        case 'ModelFile':
-          return ModelFile.fromJson(value);
-        case 'ModelList':
-          return ModelList.fromJson(value);
-        case 'ModelReturn':
-          return ModelReturn.fromJson(value);
-        case 'Name':
-          return Name.fromJson(value);
-        case 'NullableClass':
-          return NullableClass.fromJson(value);
-        case 'NumberOnly':
-          return NumberOnly.fromJson(value);
-        case 'Order':
-          return Order.fromJson(value);
-        case 'OuterComposite':
-          return OuterComposite.fromJson(value);
-        case 'OuterEnum':
-          
-           return _$enumDecode(_$OuterEnumEnumMap, value);
-        case 'OuterEnumDefaultValue':
-          
-           return _$enumDecode(_$OuterEnumDefaultValueEnumMap, value);
-        case 'OuterEnumInteger':
-          
-           return _$enumDecode(_$OuterEnumIntegerEnumMap, value);
-        case 'OuterEnumIntegerDefaultValue':
-          
-           return _$enumDecode(_$OuterEnumIntegerDefaultValueEnumMap, value);
-        case 'Pet':
-          return Pet.fromJson(value);
-        case 'ReadOnlyFirst':
-          return ReadOnlyFirst.fromJson(value);
-        case 'SpecialModelName':
-          return SpecialModelName.fromJson(value);
-        case 'Tag':
-          return Tag.fromJson(value);
-        case 'User':
-          return User.fromJson(value);
-        default:
-          Match match;
-          if (value is List && (match = _regList.firstMatch(targetType)) != null) {
-            final newTargetType = match[1];
-            return value
-              .map((v) => _deserialize(v, newTargetType, growable: growable))
-              .toList(growable: true == growable);
-          }
-          if (value is Set && (match = _regSet.firstMatch(targetType)) != null) {
-            final newTargetType = match[1];
-            return value
-              .map((v) => _deserialize(v, newTargetType, growable: growable))
-              .toSet();
-          }
-          if (value is Map && (match = _regMap.firstMatch(targetType)) != null) {
-            final newTargetType = match[1];
-            return Map.fromIterables(
-              value.keys,
-              value.values.map((v) => _deserialize(v, newTargetType, growable: growable)),
-            );
-          }
-          break;
-      }
-    } on Exception catch (e, stack) {
-      throw ApiException.withInner(HttpStatus.internalServerError, 'Exception during deserialization.', e, stack,);
-    }
-    throw ApiException(HttpStatus.internalServerError, 'Could not find a suitable class for deserialization',);
-  }
+
+  String serialize(Object obj) => obj == null ? '' : json.encode(obj);
 
   /// Update query and header parameters based on authentication settings.
   /// @param authNames The authentications to apply
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_helper.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_helper.dart
index 8e083e63f0a4..f9904f5ec71e 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_helper.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_helper.dart
@@ -59,24 +59,19 @@ String parameterToString(dynamic value) {
     return value.toUtc().toIso8601String();
   }
   if (value is EnumClass) {
-
-    return _$EnumClassEnumMap[value];
+    return value.toString();
   }
   if (value is OuterEnum) {
-
-    return _$OuterEnumEnumMap[value];
+    return value.toString();
   }
   if (value is OuterEnumDefaultValue) {
-
-    return _$OuterEnumDefaultValueEnumMap[value];
+    return value.toString();
   }
   if (value is OuterEnumInteger) {
-
-    return _$OuterEnumIntegerEnumMap[value];
+    return value.toString();
   }
   if (value is OuterEnumIntegerDefaultValue) {
-
-    return _$OuterEnumIntegerDefaultValueEnumMap[value];
+    return value.toString();
   }
   return value.toString();
 }
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/model/outer_object_with_enum_property.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/model/outer_object_with_enum_property.dart
new file mode 100644
index 000000000000..0857bb708bbe
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/model/outer_object_with_enum_property.dart
@@ -0,0 +1,50 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.0
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+@JsonSerializable(
+  checked: true,
+  createToJson: true,
+  disallowUnrecognizedKeys: true,
+  explicitToJson: true,
+)
+class OuterObjectWithEnumProperty {
+  /// Returns a new [OuterObjectWithEnumProperty] instance.
+  OuterObjectWithEnumProperty({
+    @required this.value,
+  });
+
+  @JsonKey(
+    nullable: false,
+    name: r'value',
+    required: true,
+  )
+  OuterEnumInteger value;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is OuterObjectWithEnumProperty &&
+     other.value == value;
+
+  @override
+  int get hashCode =>
+    (value == null ? 0 : value.hashCode);
+
+
+  factory OuterObjectWithEnumProperty.fromJson(Map<String, dynamic> json) => _$OuterObjectWithEnumPropertyFromJson(json);
+
+  Map<String, dynamic> toJson() => _$OuterObjectWithEnumPropertyToJson(this);
+
+  @override
+  String toString() {
+    return toJson().toString();
+  }
+
+}
+
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/pom.xml b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/pom.xml
new file mode 100644
index 000000000000..708ad4155156
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/pom.xml
@@ -0,0 +1,88 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>Dart2PetstoreClientJsonSerializableLibTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0.0-SNAPSHOT</version>
+    <name>Dart2 Petstore Client with json_serializable Lib</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <id>export-dartfmt</id>
+                        <phase>pre-install-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>export</executable>
+                            <arguments>
+                                <argument>DART_FMT_PATH=/usr/local/bin/dartfmt</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pub-get</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pub</executable>
+                            <arguments>
+                                <argument>get</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pub-build-runner</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pub</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>build_runner</argument>
+                                <argument>build</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>pub-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <executable>pub</executable>
+                            <arguments>
+                                <argument>run</argument>
+                                <argument>test</argument>
+                            </arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/test/outer_object_with_enum_property_test.dart b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/test/outer_object_with_enum_property_test.dart
new file mode 100644
index 000000000000..f7764334ed44
--- /dev/null
+++ b/samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/test/outer_object_with_enum_property_test.dart
@@ -0,0 +1,17 @@
+import 'package:openapi/api.dart';
+import 'package:test/test.dart';
+
+// tests for OuterObjectWithEnumProperty
+void main() {
+  final instance = OuterObjectWithEnumProperty();
+
+  group('test OuterObjectWithEnumProperty', () {
+    // OuterEnumInteger value
+    test('to test the property `value`', () async {
+      // TODO
+    });
+
+
+  });
+
+}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/docs/OuterObjectWithEnumProperty.md b/samples/openapi3/client/petstore/go/go-petstore/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..04d298146704
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,51 @@
+# OuterObjectWithEnumProperty
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+## Methods
+
+### NewOuterObjectWithEnumProperty
+
+`func NewOuterObjectWithEnumProperty(value OuterEnumInteger, ) *OuterObjectWithEnumProperty`
+
+NewOuterObjectWithEnumProperty instantiates a new OuterObjectWithEnumProperty object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewOuterObjectWithEnumPropertyWithDefaults
+
+`func NewOuterObjectWithEnumPropertyWithDefaults() *OuterObjectWithEnumProperty`
+
+NewOuterObjectWithEnumPropertyWithDefaults instantiates a new OuterObjectWithEnumProperty object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetValue
+
+`func (o *OuterObjectWithEnumProperty) GetValue() OuterEnumInteger`
+
+GetValue returns the Value field if non-nil, zero value otherwise.
+
+### GetValueOk
+
+`func (o *OuterObjectWithEnumProperty) GetValueOk() (*OuterEnumInteger, bool)`
+
+GetValueOk returns a tuple with the Value field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetValue
+
+`func (o *OuterObjectWithEnumProperty) SetValue(v OuterEnumInteger)`
+
+SetValue sets Value field to given value.
+
+
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/go/go-petstore/model_outer_object_with_enum_property.go b/samples/openapi3/client/petstore/go/go-petstore/model_outer_object_with_enum_property.go
new file mode 100644
index 000000000000..ed972e498d2e
--- /dev/null
+++ b/samples/openapi3/client/petstore/go/go-petstore/model_outer_object_with_enum_property.go
@@ -0,0 +1,108 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ */
+
+// Code generated by OpenAPI Generator (https://openapi-generator.tech); DO NOT EDIT.
+
+package petstore
+
+import (
+	"encoding/json"
+)
+
+// OuterObjectWithEnumProperty struct for OuterObjectWithEnumProperty
+type OuterObjectWithEnumProperty struct {
+	Value OuterEnumInteger `json:"value"`
+}
+
+// NewOuterObjectWithEnumProperty instantiates a new OuterObjectWithEnumProperty object
+// This constructor will assign default values to properties that have it defined,
+// and makes sure properties required by API are set, but the set of arguments
+// will change when the set of required properties is changed
+func NewOuterObjectWithEnumProperty(value OuterEnumInteger) *OuterObjectWithEnumProperty {
+	this := OuterObjectWithEnumProperty{}
+	this.Value = value
+	return &this
+}
+
+// NewOuterObjectWithEnumPropertyWithDefaults instantiates a new OuterObjectWithEnumProperty object
+// This constructor will only assign default values to properties that have it defined,
+// but it doesn't guarantee that properties required by API are set
+func NewOuterObjectWithEnumPropertyWithDefaults() *OuterObjectWithEnumProperty {
+	this := OuterObjectWithEnumProperty{}
+	return &this
+}
+
+// GetValue returns the Value field value
+func (o *OuterObjectWithEnumProperty) GetValue() OuterEnumInteger {
+	if o == nil {
+		var ret OuterEnumInteger
+		return ret
+	}
+
+	return o.Value
+}
+
+// GetValueOk returns a tuple with the Value field value
+// and a boolean to check if the value has been set.
+func (o *OuterObjectWithEnumProperty) GetValueOk() (*OuterEnumInteger, bool) {
+	if o == nil  {
+		return nil, false
+	}
+	return &o.Value, true
+}
+
+// SetValue sets field value
+func (o *OuterObjectWithEnumProperty) SetValue(v OuterEnumInteger) {
+	o.Value = v
+}
+
+func (o OuterObjectWithEnumProperty) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if true {
+		toSerialize["value"] = o.Value
+	}
+	return json.Marshal(toSerialize)
+}
+
+type NullableOuterObjectWithEnumProperty struct {
+	value *OuterObjectWithEnumProperty
+	isSet bool
+}
+
+func (v NullableOuterObjectWithEnumProperty) Get() *OuterObjectWithEnumProperty {
+	return v.value
+}
+
+func (v *NullableOuterObjectWithEnumProperty) Set(val *OuterObjectWithEnumProperty) {
+	v.value = val
+	v.isSet = true
+}
+
+func (v NullableOuterObjectWithEnumProperty) IsSet() bool {
+	return v.isSet
+}
+
+func (v *NullableOuterObjectWithEnumProperty) Unset() {
+	v.value = nil
+	v.isSet = false
+}
+
+func NewNullableOuterObjectWithEnumProperty(val *OuterObjectWithEnumProperty) *NullableOuterObjectWithEnumProperty {
+	return &NullableOuterObjectWithEnumProperty{value: val, isSet: true}
+}
+
+func (v NullableOuterObjectWithEnumProperty) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.value)
+}
+
+func (v *NullableOuterObjectWithEnumProperty) UnmarshalJSON(src []byte) error {
+	v.isSet = true
+	return json.Unmarshal(src, &v.value)
+}
+
+
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchema.md b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchema.md
index 94bc205bd0e6..80b7e462da3d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchema.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchema.md
@@ -3,6 +3,7 @@
 # ChildSchema
 
 A schema that does not have any special character.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchemaAllOf.md b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchemaAllOf.md
index 8cbdc808bd8a..fa7bb48d0186 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchemaAllOf.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/ChildSchemaAllOf.md
@@ -2,6 +2,7 @@
 
 # ChildSchemaAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharacters.md b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharacters.md
index c62cafef27dd..33f57d4cda66 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharacters.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharacters.md
@@ -3,6 +3,7 @@
 # MySchemaNameCharacters
 
 A schema name that has letters, numbers, punctuation and non-ASCII characters. The sanitization rules should make it possible to generate a language-specific classname with allowed characters in that programming language.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharactersAllOf.md b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharactersAllOf.md
index a5d3c39b435a..7771f62ad1e0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharactersAllOf.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/MySchemaNameCharactersAllOf.md
@@ -2,6 +2,7 @@
 
 # MySchemaNameCharactersAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/Parent.md b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/Parent.md
index 2a71a187a1cb..e71831a39a46 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/Parent.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/docs/Parent.md
@@ -2,6 +2,7 @@
 
 # Parent
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
index fb80d3c31ac8..3d032d4504ad 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Animal.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Animal.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Apple.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Apple.md
index 5a34a5a33a60..513643aeb77f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Apple.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Apple.md
@@ -2,6 +2,7 @@
 
 # Apple
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/AppleReq.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/AppleReq.md
index dd50fef8c0fb..d2fccd5306d8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/AppleReq.md
@@ -2,6 +2,7 @@
 
 # AppleReq
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Banana.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Banana.md
index 559130f2aaf2..7ddff9847aa6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Banana.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Banana.md
@@ -2,6 +2,7 @@
 
 # Banana
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/BananaReq.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/BananaReq.md
index 1528a37c6f06..35a773503b8e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/BananaReq.md
@@ -2,6 +2,7 @@
 
 # BananaReq
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/BasquePig.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/BasquePig.md
index af67d7e9c97c..05d4cf397071 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/BasquePig.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/BasquePig.md
@@ -2,6 +2,7 @@
 
 # BasquePig
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Capitalization.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Capitalization.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Cat.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Cat.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/CatAllOf.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/CatAllOf.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Category.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Category.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md
index 00451d7f1fa0..da63b7067f7f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCat.md
@@ -2,6 +2,7 @@
 
 # ChildCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCatAllOf.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCatAllOf.md
index f4c3ece5de95..35c6b1c43a66 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCatAllOf.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ChildCatAllOf.md
@@ -2,6 +2,7 @@
 
 # ChildCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ClassModel.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ClassModel.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Client.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Client.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ComplexQuadrilateral.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ComplexQuadrilateral.md
index 21602809de4b..9e7a27f8a591 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ComplexQuadrilateral.md
@@ -2,6 +2,7 @@
 
 # ComplexQuadrilateral
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/DanishPig.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/DanishPig.md
index 889ee86cd4eb..0e86a6716583 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/DanishPig.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/DanishPig.md
@@ -2,6 +2,7 @@
 
 # DanishPig
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Dog.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Dog.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/DogAllOf.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/DogAllOf.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Drawing.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Drawing.md
index 66dd1d879e09..0874f4811de9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Drawing.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Drawing.md
@@ -2,6 +2,7 @@
 
 # Drawing
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumArrays.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumTest.md
index b6dc15650d83..87f1158ba269 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EquilateralTriangle.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EquilateralTriangle.md
index afe879d01a5d..e4b49735d658 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/EquilateralTriangle.md
@@ -2,6 +2,7 @@
 
 # EquilateralTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Foo.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Foo.md
index 02c7ef53f5fa..7893cf3f4474 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Foo.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Foo.md
@@ -2,6 +2,7 @@
 
 # Foo
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
index 4b0db2607dbd..91da637f0880 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/GrandparentAnimal.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/GrandparentAnimal.md
index d47f146ed7f9..8c7632266ed1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/GrandparentAnimal.md
@@ -2,6 +2,7 @@
 
 # GrandparentAnimal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/HealthCheckResult.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/HealthCheckResult.md
index 11bb9026e461..80ba4783bbd8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/HealthCheckResult.md
@@ -3,6 +3,7 @@
 # HealthCheckResult
 
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/InlineResponseDefault.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/InlineResponseDefault.md
index 63c30c2b7334..1c7c639d48cb 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/InlineResponseDefault.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/InlineResponseDefault.md
@@ -2,6 +2,7 @@
 
 # InlineResponseDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/IsoscelesTriangle.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/IsoscelesTriangle.md
index 31c0788e0229..535e9216413f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/IsoscelesTriangle.md
@@ -2,6 +2,7 @@
 
 # IsoscelesTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MapTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Model200Response.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Model200Response.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelReturn.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelReturn.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Name.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Name.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableClass.md
index e1bf17954e6b..c8152be3d314 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NullableClass.md
@@ -2,6 +2,7 @@
 
 # NullableClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NumberOnly.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/NumberOnly.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Order.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Order.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/OuterComposite.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/OuterComposite.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ParentPet.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ParentPet.md
index e1fabb2e4aa7..ad7e02196658 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ParentPet.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ParentPet.md
@@ -2,6 +2,7 @@
 
 # ParentPet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pet.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pet.md
index 37ac007b7931..8aab74536872 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pet.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/QuadrilateralInterface.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/QuadrilateralInterface.md
index 24050740c873..a26b27107797 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/QuadrilateralInterface.md
@@ -2,6 +2,7 @@
 
 # QuadrilateralInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ScaleneTriangle.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ScaleneTriangle.md
index 5d30088669b5..f49fe5a12f33 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ScaleneTriangle.md
@@ -2,6 +2,7 @@
 
 # ScaleneTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeInterface.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeInterface.md
index f9d200d032b0..f8b65a8a9720 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeInterface.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ShapeInterface.md
@@ -2,6 +2,7 @@
 
 # ShapeInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/SimpleQuadrilateral.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/SimpleQuadrilateral.md
index b944413849ce..c2cf751d1b8a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/SimpleQuadrilateral.md
@@ -2,6 +2,7 @@
 
 # SimpleQuadrilateral
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/SpecialModelName.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Tag.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Tag.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/TriangleInterface.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/TriangleInterface.md
index c15bd90f0bac..525872029f5c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/TriangleInterface.md
@@ -2,6 +2,7 @@
 
 # TriangleInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/User.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/User.md
index 93243ceb71ac..c29bce5c1261 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/User.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Whale.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Whale.md
index 562b49786da0..87470ae5fac7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Whale.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Whale.md
@@ -2,6 +2,7 @@
 
 # Whale
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Zebra.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Zebra.md
index 156de233f7f0..eafe1861f2be 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/Zebra.md
@@ -2,6 +2,7 @@
 
 # Zebra
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/native/docs/AdditionalPropertiesClass.md
index fb80d3c31ac8..3d032d4504ad 100644
--- a/samples/openapi3/client/petstore/java/native/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/java/native/docs/AdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # AdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Animal.md b/samples/openapi3/client/petstore/java/native/docs/Animal.md
index c8e18ae55e4f..7edc25cd2b04 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Animal.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Animal.md
@@ -2,6 +2,7 @@
 
 # Animal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Apple.md b/samples/openapi3/client/petstore/java/native/docs/Apple.md
index 5a34a5a33a60..513643aeb77f 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Apple.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Apple.md
@@ -2,6 +2,7 @@
 
 # Apple
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/AppleReq.md b/samples/openapi3/client/petstore/java/native/docs/AppleReq.md
index dd50fef8c0fb..d2fccd5306d8 100644
--- a/samples/openapi3/client/petstore/java/native/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/java/native/docs/AppleReq.md
@@ -2,6 +2,7 @@
 
 # AppleReq
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
index e1a0e54c0b57..9b1f85869990 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/java/native/docs/ArrayOfNumberOnly.md
index 25670a603c47..4e95f1ae74ef 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ArrayOfNumberOnly.md
@@ -2,6 +2,7 @@
 
 # ArrayOfNumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ArrayTest.md b/samples/openapi3/client/petstore/java/native/docs/ArrayTest.md
index 7c6f6245ac8a..9b90810fc286 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ArrayTest.md
@@ -2,6 +2,7 @@
 
 # ArrayTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Banana.md b/samples/openapi3/client/petstore/java/native/docs/Banana.md
index 559130f2aaf2..7ddff9847aa6 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Banana.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Banana.md
@@ -2,6 +2,7 @@
 
 # Banana
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/BananaReq.md b/samples/openapi3/client/petstore/java/native/docs/BananaReq.md
index 1528a37c6f06..35a773503b8e 100644
--- a/samples/openapi3/client/petstore/java/native/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/java/native/docs/BananaReq.md
@@ -2,6 +2,7 @@
 
 # BananaReq
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/BasquePig.md b/samples/openapi3/client/petstore/java/native/docs/BasquePig.md
index af67d7e9c97c..05d4cf397071 100644
--- a/samples/openapi3/client/petstore/java/native/docs/BasquePig.md
+++ b/samples/openapi3/client/petstore/java/native/docs/BasquePig.md
@@ -2,6 +2,7 @@
 
 # BasquePig
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Capitalization.md b/samples/openapi3/client/petstore/java/native/docs/Capitalization.md
index 7b73c40b5545..ad8939b744cd 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Capitalization.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Capitalization.md
@@ -2,6 +2,7 @@
 
 # Capitalization
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Cat.md b/samples/openapi3/client/petstore/java/native/docs/Cat.md
index 39c2f864df88..87a3ab44a396 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Cat.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Cat.md
@@ -2,6 +2,7 @@
 
 # Cat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/CatAllOf.md b/samples/openapi3/client/petstore/java/native/docs/CatAllOf.md
index 1098fd900c5d..3fd01aaebfc9 100644
--- a/samples/openapi3/client/petstore/java/native/docs/CatAllOf.md
+++ b/samples/openapi3/client/petstore/java/native/docs/CatAllOf.md
@@ -2,6 +2,7 @@
 
 # CatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Category.md b/samples/openapi3/client/petstore/java/native/docs/Category.md
index 613ea9f7ee24..d03ffbfd06f9 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Category.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Category.md
@@ -2,6 +2,7 @@
 
 # Category
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ChildCat.md b/samples/openapi3/client/petstore/java/native/docs/ChildCat.md
index 00451d7f1fa0..da63b7067f7f 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ChildCat.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ChildCat.md
@@ -2,6 +2,7 @@
 
 # ChildCat
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ChildCatAllOf.md b/samples/openapi3/client/petstore/java/native/docs/ChildCatAllOf.md
index f4c3ece5de95..35c6b1c43a66 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ChildCatAllOf.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ChildCatAllOf.md
@@ -2,6 +2,7 @@
 
 # ChildCatAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ClassModel.md b/samples/openapi3/client/petstore/java/native/docs/ClassModel.md
index d5453c20133a..04beba3384a1 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ClassModel.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ClassModel.md
@@ -3,6 +3,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Client.md b/samples/openapi3/client/petstore/java/native/docs/Client.md
index 228df492383f..125a20b3fcee 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Client.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Client.md
@@ -2,6 +2,7 @@
 
 # Client
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ComplexQuadrilateral.md b/samples/openapi3/client/petstore/java/native/docs/ComplexQuadrilateral.md
index 21602809de4b..9e7a27f8a591 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ComplexQuadrilateral.md
@@ -2,6 +2,7 @@
 
 # ComplexQuadrilateral
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/DanishPig.md b/samples/openapi3/client/petstore/java/native/docs/DanishPig.md
index 889ee86cd4eb..0e86a6716583 100644
--- a/samples/openapi3/client/petstore/java/native/docs/DanishPig.md
+++ b/samples/openapi3/client/petstore/java/native/docs/DanishPig.md
@@ -2,6 +2,7 @@
 
 # DanishPig
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Dog.md b/samples/openapi3/client/petstore/java/native/docs/Dog.md
index 73cedf2bc919..f4ba57fa3b86 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Dog.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Dog.md
@@ -2,6 +2,7 @@
 
 # Dog
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/DogAllOf.md b/samples/openapi3/client/petstore/java/native/docs/DogAllOf.md
index cbeb9e9a22df..1f7e23d981b7 100644
--- a/samples/openapi3/client/petstore/java/native/docs/DogAllOf.md
+++ b/samples/openapi3/client/petstore/java/native/docs/DogAllOf.md
@@ -2,6 +2,7 @@
 
 # DogAllOf
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Drawing.md b/samples/openapi3/client/petstore/java/native/docs/Drawing.md
index 66dd1d879e09..0874f4811de9 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Drawing.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Drawing.md
@@ -2,6 +2,7 @@
 
 # Drawing
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/EnumArrays.md b/samples/openapi3/client/petstore/java/native/docs/EnumArrays.md
index 869b7a6c066d..94505276726b 100644
--- a/samples/openapi3/client/petstore/java/native/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/java/native/docs/EnumArrays.md
@@ -2,6 +2,7 @@
 
 # EnumArrays
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/EnumTest.md b/samples/openapi3/client/petstore/java/native/docs/EnumTest.md
index b6dc15650d83..87f1158ba269 100644
--- a/samples/openapi3/client/petstore/java/native/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/java/native/docs/EnumTest.md
@@ -2,6 +2,7 @@
 
 # EnumTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/EquilateralTriangle.md b/samples/openapi3/client/petstore/java/native/docs/EquilateralTriangle.md
index afe879d01a5d..e4b49735d658 100644
--- a/samples/openapi3/client/petstore/java/native/docs/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/java/native/docs/EquilateralTriangle.md
@@ -2,6 +2,7 @@
 
 # EquilateralTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/java/native/docs/FileSchemaTestClass.md
index 3a95e27d7c09..2602dc746104 100644
--- a/samples/openapi3/client/petstore/java/native/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/java/native/docs/FileSchemaTestClass.md
@@ -2,6 +2,7 @@
 
 # FileSchemaTestClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Foo.md b/samples/openapi3/client/petstore/java/native/docs/Foo.md
index 02c7ef53f5fa..7893cf3f4474 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Foo.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Foo.md
@@ -2,6 +2,7 @@
 
 # Foo
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/FormatTest.md b/samples/openapi3/client/petstore/java/native/docs/FormatTest.md
index 4b0db2607dbd..91da637f0880 100644
--- a/samples/openapi3/client/petstore/java/native/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/java/native/docs/FormatTest.md
@@ -2,6 +2,7 @@
 
 # FormatTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/GrandparentAnimal.md b/samples/openapi3/client/petstore/java/native/docs/GrandparentAnimal.md
index d47f146ed7f9..8c7632266ed1 100644
--- a/samples/openapi3/client/petstore/java/native/docs/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/java/native/docs/GrandparentAnimal.md
@@ -2,6 +2,7 @@
 
 # GrandparentAnimal
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/java/native/docs/HasOnlyReadOnly.md
index 4795b40ef65e..6416f8f37158 100644
--- a/samples/openapi3/client/petstore/java/native/docs/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/java/native/docs/HasOnlyReadOnly.md
@@ -2,6 +2,7 @@
 
 # HasOnlyReadOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/HealthCheckResult.md b/samples/openapi3/client/petstore/java/native/docs/HealthCheckResult.md
index 11bb9026e461..80ba4783bbd8 100644
--- a/samples/openapi3/client/petstore/java/native/docs/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/java/native/docs/HealthCheckResult.md
@@ -3,6 +3,7 @@
 # HealthCheckResult
 
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/InlineResponseDefault.md b/samples/openapi3/client/petstore/java/native/docs/InlineResponseDefault.md
index 63c30c2b7334..1c7c639d48cb 100644
--- a/samples/openapi3/client/petstore/java/native/docs/InlineResponseDefault.md
+++ b/samples/openapi3/client/petstore/java/native/docs/InlineResponseDefault.md
@@ -2,6 +2,7 @@
 
 # InlineResponseDefault
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/IsoscelesTriangle.md b/samples/openapi3/client/petstore/java/native/docs/IsoscelesTriangle.md
index 31c0788e0229..535e9216413f 100644
--- a/samples/openapi3/client/petstore/java/native/docs/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/java/native/docs/IsoscelesTriangle.md
@@ -2,6 +2,7 @@
 
 # IsoscelesTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/MapTest.md b/samples/openapi3/client/petstore/java/native/docs/MapTest.md
index 9c3aeb6495c1..16f3ab934496 100644
--- a/samples/openapi3/client/petstore/java/native/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/java/native/docs/MapTest.md
@@ -2,6 +2,7 @@
 
 # MapTest
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 52d10b2cc7a1..8bc2ed1571fe 100644
--- a/samples/openapi3/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -2,6 +2,7 @@
 
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Model200Response.md b/samples/openapi3/client/petstore/java/native/docs/Model200Response.md
index f9928d70622c..91c45e494210 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Model200Response.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Model200Response.md
@@ -3,6 +3,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ModelApiResponse.md b/samples/openapi3/client/petstore/java/native/docs/ModelApiResponse.md
index 14fb7f1ed27b..aca98405e375 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ModelApiResponse.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ModelApiResponse.md
@@ -2,6 +2,7 @@
 
 # ModelApiResponse
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ModelReturn.md b/samples/openapi3/client/petstore/java/native/docs/ModelReturn.md
index 5005d4b72392..3684358a040f 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ModelReturn.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ModelReturn.md
@@ -3,6 +3,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Name.md b/samples/openapi3/client/petstore/java/native/docs/Name.md
index b815a0b4c994..219628217ca1 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Name.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Name.md
@@ -3,6 +3,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/NullableClass.md b/samples/openapi3/client/petstore/java/native/docs/NullableClass.md
index e1bf17954e6b..c8152be3d314 100644
--- a/samples/openapi3/client/petstore/java/native/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/java/native/docs/NullableClass.md
@@ -2,6 +2,7 @@
 
 # NullableClass
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/NumberOnly.md b/samples/openapi3/client/petstore/java/native/docs/NumberOnly.md
index 4b9d048546ce..26c0b18032ef 100644
--- a/samples/openapi3/client/petstore/java/native/docs/NumberOnly.md
+++ b/samples/openapi3/client/petstore/java/native/docs/NumberOnly.md
@@ -2,6 +2,7 @@
 
 # NumberOnly
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Order.md b/samples/openapi3/client/petstore/java/native/docs/Order.md
index 30782d6ae776..fa708e882413 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Order.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Order.md
@@ -2,6 +2,7 @@
 
 # Order
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/OuterComposite.md b/samples/openapi3/client/petstore/java/native/docs/OuterComposite.md
index 594951145a3f..7274cb075938 100644
--- a/samples/openapi3/client/petstore/java/native/docs/OuterComposite.md
+++ b/samples/openapi3/client/petstore/java/native/docs/OuterComposite.md
@@ -2,6 +2,7 @@
 
 # OuterComposite
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ParentPet.md b/samples/openapi3/client/petstore/java/native/docs/ParentPet.md
index e1fabb2e4aa7..ad7e02196658 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ParentPet.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ParentPet.md
@@ -2,6 +2,7 @@
 
 # ParentPet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Pet.md b/samples/openapi3/client/petstore/java/native/docs/Pet.md
index 37ac007b7931..8aab74536872 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Pet.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Pet.md
@@ -2,6 +2,7 @@
 
 # Pet
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/QuadrilateralInterface.md b/samples/openapi3/client/petstore/java/native/docs/QuadrilateralInterface.md
index 24050740c873..a26b27107797 100644
--- a/samples/openapi3/client/petstore/java/native/docs/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/java/native/docs/QuadrilateralInterface.md
@@ -2,6 +2,7 @@
 
 # QuadrilateralInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ReadOnlyFirst.md b/samples/openapi3/client/petstore/java/native/docs/ReadOnlyFirst.md
index a692499dc661..a329bf4419a2 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ReadOnlyFirst.md
@@ -2,6 +2,7 @@
 
 # ReadOnlyFirst
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ScaleneTriangle.md b/samples/openapi3/client/petstore/java/native/docs/ScaleneTriangle.md
index 5d30088669b5..f49fe5a12f33 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ScaleneTriangle.md
@@ -2,6 +2,7 @@
 
 # ScaleneTriangle
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/ShapeInterface.md b/samples/openapi3/client/petstore/java/native/docs/ShapeInterface.md
index f9d200d032b0..f8b65a8a9720 100644
--- a/samples/openapi3/client/petstore/java/native/docs/ShapeInterface.md
+++ b/samples/openapi3/client/petstore/java/native/docs/ShapeInterface.md
@@ -2,6 +2,7 @@
 
 # ShapeInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/SimpleQuadrilateral.md b/samples/openapi3/client/petstore/java/native/docs/SimpleQuadrilateral.md
index b944413849ce..c2cf751d1b8a 100644
--- a/samples/openapi3/client/petstore/java/native/docs/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/java/native/docs/SimpleQuadrilateral.md
@@ -2,6 +2,7 @@
 
 # SimpleQuadrilateral
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/SpecialModelName.md b/samples/openapi3/client/petstore/java/native/docs/SpecialModelName.md
index 934b8f0f25d7..2692c1caafe1 100644
--- a/samples/openapi3/client/petstore/java/native/docs/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/java/native/docs/SpecialModelName.md
@@ -2,6 +2,7 @@
 
 # SpecialModelName
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Tag.md b/samples/openapi3/client/petstore/java/native/docs/Tag.md
index f24eba7d222e..70d36f5d0d4d 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Tag.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Tag.md
@@ -2,6 +2,7 @@
 
 # Tag
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/TriangleInterface.md b/samples/openapi3/client/petstore/java/native/docs/TriangleInterface.md
index c15bd90f0bac..525872029f5c 100644
--- a/samples/openapi3/client/petstore/java/native/docs/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/java/native/docs/TriangleInterface.md
@@ -2,6 +2,7 @@
 
 # TriangleInterface
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/User.md b/samples/openapi3/client/petstore/java/native/docs/User.md
index 93243ceb71ac..c29bce5c1261 100644
--- a/samples/openapi3/client/petstore/java/native/docs/User.md
+++ b/samples/openapi3/client/petstore/java/native/docs/User.md
@@ -2,6 +2,7 @@
 
 # User
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Whale.md b/samples/openapi3/client/petstore/java/native/docs/Whale.md
index 562b49786da0..87470ae5fac7 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Whale.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Whale.md
@@ -2,6 +2,7 @@
 
 # Whale
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/java/native/docs/Zebra.md b/samples/openapi3/client/petstore/java/native/docs/Zebra.md
index 156de233f7f0..eafe1861f2be 100644
--- a/samples/openapi3/client/petstore/java/native/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/java/native/docs/Zebra.md
@@ -2,6 +2,7 @@
 
 # Zebra
 
+
 ## Properties
 
 Name | Type | Description | Notes
diff --git a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
index 50dd7b24b7af..6af928f27995 100755
--- a/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-legacy/.openapi-generator/FILES
@@ -44,6 +44,7 @@ docs/OuterEnum.md
 docs/OuterEnumDefaultValue.md
 docs/OuterEnumInteger.md
 docs/OuterEnumIntegerDefaultValue.md
+docs/OuterObjectWithEnumProperty.md
 docs/Pet.md
 docs/PetApi.md
 docs/ReadOnlyFirst.md
@@ -104,6 +105,7 @@ petstore_api/models/outer_enum.py
 petstore_api/models/outer_enum_default_value.py
 petstore_api/models/outer_enum_integer.py
 petstore_api/models/outer_enum_integer_default_value.py
+petstore_api/models/outer_object_with_enum_property.py
 petstore_api/models/pet.py
 petstore_api/models/read_only_first.py
 petstore_api/models/special_model_name.py
diff --git a/samples/openapi3/client/petstore/python-legacy/README.md b/samples/openapi3/client/petstore/python-legacy/README.md
index 4d8a7194aa89..65ce00102b4c 100755
--- a/samples/openapi3/client/petstore/python-legacy/README.md
+++ b/samples/openapi3/client/petstore/python-legacy/README.md
@@ -89,6 +89,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fake_outer_composite_serialize**](docs/FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 *FakeApi* | [**fake_outer_number_serialize**](docs/FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fake_outer_string_serialize**](docs/FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**fake_property_enum_integer_serialize**](docs/FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 *FakeApi* | [**test_body_with_file_schema**](docs/FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 *FakeApi* | [**test_body_with_query_params**](docs/FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 *FakeApi* | [**test_client_model**](docs/FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -162,6 +163,7 @@ Class | Method | HTTP request | Description
  - [OuterEnumDefaultValue](docs/OuterEnumDefaultValue.md)
  - [OuterEnumInteger](docs/OuterEnumInteger.md)
  - [OuterEnumIntegerDefaultValue](docs/OuterEnumIntegerDefaultValue.md)
+ - [OuterObjectWithEnumProperty](docs/OuterObjectWithEnumProperty.md)
  - [Pet](docs/Pet.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [SpecialModelName](docs/SpecialModelName.md)
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
index 796a789d4c4b..44eba7315667 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Animal.md b/samples/openapi3/client/petstore/python-legacy/docs/Animal.md
index 7ed4ba541fa3..8bc43ab53f33 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Animal.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ApiResponse.md b/samples/openapi3/client/petstore/python-legacy/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ApiResponse.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
index aa3988ab1679..b53b6cdb8c46 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
index 2c3de967aec6..6116bc7489fd 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ArrayTest.md b/samples/openapi3/client/petstore/python-legacy/docs/ArrayTest.md
index 6ab0d1378065..81420a3b9bbb 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Capitalization.md b/samples/openapi3/client/petstore/python-legacy/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Capitalization.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Cat.md b/samples/openapi3/client/petstore/python-legacy/docs/Cat.md
index 8d30565d014e..b3eff72b3095 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Cat.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/CatAllOf.md b/samples/openapi3/client/petstore/python-legacy/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/CatAllOf.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Category.md b/samples/openapi3/client/petstore/python-legacy/docs/Category.md
index 7e5c1e316499..095459c80b65 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Category.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ClassModel.md b/samples/openapi3/client/petstore/python-legacy/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ClassModel.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Client.md b/samples/openapi3/client/petstore/python-legacy/docs/Client.md
index 88e99384f92c..c3986008d6c3 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Client.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Dog.md b/samples/openapi3/client/petstore/python-legacy/docs/Dog.md
index f727487975c4..7eeaf5b68515 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Dog.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/DogAllOf.md b/samples/openapi3/client/petstore/python-legacy/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/DogAllOf.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/EnumArrays.md b/samples/openapi3/client/petstore/python-legacy/docs/EnumArrays.md
index e15a5f1fd049..92de0e955650 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/EnumClass.md b/samples/openapi3/client/petstore/python-legacy/docs/EnumClass.md
index 67f017becd0c..64830e3d1dee 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/EnumClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/EnumTest.md b/samples/openapi3/client/petstore/python-legacy/docs/EnumTest.md
index bd1e2beb90d3..46b320fbe45e 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md b/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
index 50de8cc758fa..f7bbbecdce6c 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/FakeApi.md
@@ -10,6 +10,7 @@ Method | HTTP request | Description
 [**fake_outer_composite_serialize**](FakeApi.md#fake_outer_composite_serialize) | **POST** /fake/outer/composite | 
 [**fake_outer_number_serialize**](FakeApi.md#fake_outer_number_serialize) | **POST** /fake/outer/number | 
 [**fake_outer_string_serialize**](FakeApi.md#fake_outer_string_serialize) | **POST** /fake/outer/string | 
+[**fake_property_enum_integer_serialize**](FakeApi.md#fake_property_enum_integer_serialize) | **POST** /fake/property/enum-int | 
 [**test_body_with_file_schema**](FakeApi.md#test_body_with_file_schema) | **PUT** /fake/body-with-file-schema | 
 [**test_body_with_query_params**](FakeApi.md#test_body_with_query_params) | **PUT** /fake/body-with-query-params | 
 [**test_client_model**](FakeApi.md#test_client_model) | **PATCH** /fake | To test \&quot;client\&quot; model
@@ -448,6 +449,67 @@ No authorization required
 
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
+# **fake_property_enum_integer_serialize**
+> OuterObjectWithEnumProperty fake_property_enum_integer_serialize(outer_object_with_enum_property)
+
+
+
+Test serialization of enum (int) properties with examples
+
+### Example
+
+```python
+from __future__ import print_function
+import time
+import petstore_api
+from petstore_api.rest import ApiException
+from pprint import pprint
+# Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
+# See configuration.py for a list of all supported configuration parameters.
+configuration = petstore_api.Configuration(
+    host = "http://petstore.swagger.io:80/v2"
+)
+
+
+# Enter a context with an instance of the API client
+with petstore_api.ApiClient() as api_client:
+    # Create an instance of the API class
+    api_instance = petstore_api.FakeApi(api_client)
+    outer_object_with_enum_property = petstore_api.OuterObjectWithEnumProperty() # OuterObjectWithEnumProperty | Input enum (int) as post body
+
+    try:
+        api_response = api_instance.fake_property_enum_integer_serialize(outer_object_with_enum_property)
+        pprint(api_response)
+    except ApiException as e:
+        print("Exception when calling FakeApi->fake_property_enum_integer_serialize: %s\n" % e)
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **outer_object_with_enum_property** | [**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)| Input enum (int) as post body | 
+
+### Return type
+
+[**OuterObjectWithEnumProperty**](OuterObjectWithEnumProperty.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: */*
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Output enum (int) |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **test_body_with_file_schema**
 > test_body_with_file_schema(file_schema_test_class)
 
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/File.md b/samples/openapi3/client/petstore/python-legacy/docs/File.md
index f17ba0057d04..63b1d1a65186 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/File.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/python-legacy/docs/FileSchemaTestClass.md
index dc3722289887..58d71b7a26be 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Foo.md b/samples/openapi3/client/petstore/python-legacy/docs/Foo.md
index c55aa2cf103c..258a8444fd4d 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Foo.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Foo.md
@@ -1,5 +1,6 @@
 # Foo
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/FormatTest.md b/samples/openapi3/client/petstore/python-legacy/docs/FormatTest.md
index 919d954bf525..971997b5ec50 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/HealthCheckResult.md b/samples/openapi3/client/petstore/python-legacy/docs/HealthCheckResult.md
index 7cde5c093292..a8df56c8fafc 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/HealthCheckResult.md
@@ -1,6 +1,7 @@
 # HealthCheckResult
 
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/InlineResponseDefault.md b/samples/openapi3/client/petstore/python-legacy/docs/InlineResponseDefault.md
index 9c754420f24a..f0a52bc4639c 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/InlineResponseDefault.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/InlineResponseDefault.md
@@ -1,5 +1,6 @@
 # InlineResponseDefault
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/List.md b/samples/openapi3/client/petstore/python-legacy/docs/List.md
index 11f4f3a05f32..4b60956971aa 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/List.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/MapTest.md b/samples/openapi3/client/petstore/python-legacy/docs/MapTest.md
index a5601691f885..aea74bc8689c 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index b9808d5275e5..53e84e839bbb 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Model200Response.md b/samples/openapi3/client/petstore/python-legacy/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Model200Response.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ModelReturn.md b/samples/openapi3/client/petstore/python-legacy/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ModelReturn.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Name.md b/samples/openapi3/client/petstore/python-legacy/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Name.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/NullableClass.md b/samples/openapi3/client/petstore/python-legacy/docs/NullableClass.md
index c8b74746ae97..64964d9bbddd 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/NullableClass.md
@@ -1,5 +1,6 @@
 # NullableClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/NumberOnly.md b/samples/openapi3/client/petstore/python-legacy/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/NumberOnly.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Order.md b/samples/openapi3/client/petstore/python-legacy/docs/Order.md
index b5f7b22d34cf..f360fffe8149 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Order.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterComposite.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterComposite.md
index bab07ad559eb..31013673df73 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/OuterComposite.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterComposite.md
@@ -1,5 +1,6 @@
 # OuterComposite
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnum.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnum.md
index 06d413b01680..4cb31437c7e2 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnum.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnum.md
@@ -1,5 +1,6 @@
 # OuterEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumDefaultValue.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumDefaultValue.md
index 1487a7103934..4a5ba6428d83 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumDefaultValue.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumDefaultValue.md
@@ -1,5 +1,6 @@
 # OuterEnumDefaultValue
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumInteger.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumInteger.md
index 8be15eee6a2c..fc84ec365851 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumInteger.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumInteger.md
@@ -1,5 +1,6 @@
 # OuterEnumInteger
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumIntegerDefaultValue.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumIntegerDefaultValue.md
index 27d962f106e1..0de4199a8401 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumIntegerDefaultValue.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterEnumIntegerDefaultValue.md
@@ -1,5 +1,6 @@
 # OuterEnumIntegerDefaultValue
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/OuterObjectWithEnumProperty.md b/samples/openapi3/client/petstore/python-legacy/docs/OuterObjectWithEnumProperty.md
new file mode 100644
index 000000000000..bca6ef5bc4c2
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-legacy/docs/OuterObjectWithEnumProperty.md
@@ -0,0 +1,11 @@
+# OuterObjectWithEnumProperty
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**OuterEnumInteger**](OuterEnumInteger.md) |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Pet.md b/samples/openapi3/client/petstore/python-legacy/docs/Pet.md
index 9e15090300f8..c462e794c89a 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Pet.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Pet.md
@@ -1,5 +1,6 @@
 # Pet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/ReadOnlyFirst.md b/samples/openapi3/client/petstore/python-legacy/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/SpecialModelName.md b/samples/openapi3/client/petstore/python-legacy/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/Tag.md b/samples/openapi3/client/petstore/python-legacy/docs/Tag.md
index 243cd98eda69..4ccac4949afc 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/Tag.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/docs/User.md b/samples/openapi3/client/petstore/python-legacy/docs/User.md
index 443ac123fdca..b0079f591b6e 100755
--- a/samples/openapi3/client/petstore/python-legacy/docs/User.md
+++ b/samples/openapi3/client/petstore/python-legacy/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
index 0625babbb660..adc76de2316f 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/__init__.py
@@ -73,6 +73,7 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue
 from petstore_api.models.outer_enum_integer import OuterEnumInteger
 from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue
+from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/api/fake_api.py
index a5038873bb40..d5dd027679ea 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/api/fake_api.py
@@ -843,6 +843,145 @@ class FakeApi(object):
             collection_formats=collection_formats,
             _request_auth=local_var_params.get('_request_auth'))
 
+    def fake_property_enum_integer_serialize(self, outer_object_with_enum_property, **kwargs):  # noqa: E501
+        """fake_property_enum_integer_serialize  # noqa: E501
+
+        Test serialization of enum (int) properties with examples  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.fake_property_enum_integer_serialize(outer_object_with_enum_property, async_req=True)
+        >>> result = thread.get()
+
+        :param outer_object_with_enum_property: Input enum (int) as post body (required)
+        :type outer_object_with_enum_property: OuterObjectWithEnumProperty
+        :param async_req: Whether to execute the request asynchronously.
+        :type async_req: bool, optional
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :type _preload_content: bool, optional
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :return: Returns the result object.
+                 If the method is called asynchronously,
+                 returns the request thread.
+        :rtype: OuterObjectWithEnumProperty
+        """
+        kwargs['_return_http_data_only'] = True
+        return self.fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, **kwargs)  # noqa: E501
+
+    def fake_property_enum_integer_serialize_with_http_info(self, outer_object_with_enum_property, **kwargs):  # noqa: E501
+        """fake_property_enum_integer_serialize  # noqa: E501
+
+        Test serialization of enum (int) properties with examples  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.fake_property_enum_integer_serialize_with_http_info(outer_object_with_enum_property, async_req=True)
+        >>> result = thread.get()
+
+        :param outer_object_with_enum_property: Input enum (int) as post body (required)
+        :type outer_object_with_enum_property: OuterObjectWithEnumProperty
+        :param async_req: Whether to execute the request asynchronously.
+        :type async_req: bool, optional
+        :param _return_http_data_only: response data without head status code
+                                       and headers
+        :type _return_http_data_only: bool, optional
+        :param _preload_content: if False, the urllib3.HTTPResponse object will
+                                 be returned without reading/decoding response
+                                 data. Default is True.
+        :type _preload_content: bool, optional
+        :param _request_timeout: timeout setting for this request. If one
+                                 number provided, it will be total request
+                                 timeout. It can also be a pair (tuple) of
+                                 (connection, read) timeouts.
+        :param _request_auth: set to override the auth_settings for an a single
+                              request; this effectively ignores the authentication
+                              in the spec for a single request.
+        :type _request_auth: dict, optional
+        :return: Returns the result object.
+                 If the method is called asynchronously,
+                 returns the request thread.
+        :rtype: tuple(OuterObjectWithEnumProperty, status_code(int), headers(HTTPHeaderDict))
+        """
+
+        local_var_params = locals()
+
+        all_params = [
+            'outer_object_with_enum_property'
+        ]
+        all_params.extend(
+            [
+                'async_req',
+                '_return_http_data_only',
+                '_preload_content',
+                '_request_timeout',
+                '_request_auth'
+            ]
+        )
+
+        for key, val in six.iteritems(local_var_params['kwargs']):
+            if key not in all_params:
+                raise ApiTypeError(
+                    "Got an unexpected keyword argument '%s'"
+                    " to method fake_property_enum_integer_serialize" % key
+                )
+            local_var_params[key] = val
+        del local_var_params['kwargs']
+        # verify the required parameter 'outer_object_with_enum_property' is set
+        if self.api_client.client_side_validation and ('outer_object_with_enum_property' not in local_var_params or  # noqa: E501
+                                                        local_var_params['outer_object_with_enum_property'] is None):  # noqa: E501
+            raise ApiValueError("Missing the required parameter `outer_object_with_enum_property` when calling `fake_property_enum_integer_serialize`")  # noqa: E501
+
+        collection_formats = {}
+
+        path_params = {}
+
+        query_params = []
+
+        header_params = {}
+
+        form_params = []
+        local_var_files = {}
+
+        body_params = None
+        if 'outer_object_with_enum_property' in local_var_params:
+            body_params = local_var_params['outer_object_with_enum_property']
+        # HTTP header `Accept`
+        header_params['Accept'] = self.api_client.select_header_accept(
+            ['*/*'])  # noqa: E501
+
+        # HTTP header `Content-Type`
+        header_params['Content-Type'] = self.api_client.select_header_content_type(  # noqa: E501
+            ['application/json'])  # noqa: E501
+
+        # Authentication setting
+        auth_settings = []  # noqa: E501
+        
+        response_types_map = {
+            200: "OuterObjectWithEnumProperty",
+        }
+
+        return self.api_client.call_api(
+            '/fake/property/enum-int', 'POST',
+            path_params,
+            query_params,
+            header_params,
+            body=body_params,
+            post_params=form_params,
+            files=local_var_files,
+            response_types_map=response_types_map,
+            auth_settings=auth_settings,
+            async_req=local_var_params.get('async_req'),
+            _return_http_data_only=local_var_params.get('_return_http_data_only'),  # noqa: E501
+            _preload_content=local_var_params.get('_preload_content', True),
+            _request_timeout=local_var_params.get('_request_timeout'),
+            collection_formats=collection_formats,
+            _request_auth=local_var_params.get('_request_auth'))
+
     def test_body_with_file_schema(self, file_schema_test_class, **kwargs):  # noqa: E501
         """test_body_with_file_schema  # noqa: E501
 
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
index d24bf127f02a..7df4fcdfadc1 100755
--- a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/__init__.py
@@ -52,6 +52,7 @@ from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue
 from petstore_api.models.outer_enum_integer import OuterEnumInteger
 from petstore_api.models.outer_enum_integer_default_value import OuterEnumIntegerDefaultValue
+from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty
 from petstore_api.models.pet import Pet
 from petstore_api.models.read_only_first import ReadOnlyFirst
 from petstore_api.models.special_model_name import SpecialModelName
diff --git a/samples/openapi3/client/petstore/python-legacy/petstore_api/models/outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/outer_object_with_enum_property.py
new file mode 100644
index 000000000000..8a50b129a7fb
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-legacy/petstore_api/models/outer_object_with_enum_property.py
@@ -0,0 +1,129 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import inspect
+import pprint
+import re  # noqa: F401
+import six
+
+from petstore_api.configuration import Configuration
+
+
+class OuterObjectWithEnumProperty(object):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+    """
+
+    """
+    Attributes:
+      openapi_types (dict): The key is attribute name
+                            and the value is attribute type.
+      attribute_map (dict): The key is attribute name
+                            and the value is json key in definition.
+    """
+    openapi_types = {
+        'value': 'OuterEnumInteger'
+    }
+
+    attribute_map = {
+        'value': 'value'
+    }
+
+    def __init__(self, value=None, local_vars_configuration=None):  # noqa: E501
+        """OuterObjectWithEnumProperty - a model defined in OpenAPI"""  # noqa: E501
+        if local_vars_configuration is None:
+            local_vars_configuration = Configuration.get_default_copy()
+        self.local_vars_configuration = local_vars_configuration
+
+        self._value = None
+        self.discriminator = None
+
+        self.value = value
+
+    @property
+    def value(self):
+        """Gets the value of this OuterObjectWithEnumProperty.  # noqa: E501
+
+
+        :return: The value of this OuterObjectWithEnumProperty.  # noqa: E501
+        :rtype: OuterEnumInteger
+        """
+        return self._value
+
+    @value.setter
+    def value(self, value):
+        """Sets the value of this OuterObjectWithEnumProperty.
+
+
+        :param value: The value of this OuterObjectWithEnumProperty.  # noqa: E501
+        :type value: OuterEnumInteger
+        """
+        if self.local_vars_configuration.client_side_validation and value is None:  # noqa: E501
+            raise ValueError("Invalid value for `value`, must not be `None`")  # noqa: E501
+
+        self._value = value
+
+    def to_dict(self, serialize=False):
+        """Returns the model properties as a dict"""
+        result = {}
+
+        def convert(x):
+            if hasattr(x, "to_dict"):
+                args = inspect.getargspec(x.to_dict).args
+                if len(args) == 1:
+                    return x.to_dict()
+                else:
+                    return x.to_dict(serialize)
+            else:
+                return x
+
+        for attr, _ in six.iteritems(self.openapi_types):
+            value = getattr(self, attr)
+            attr = self.attribute_map.get(attr, attr) if serialize else attr
+            if isinstance(value, list):
+                result[attr] = list(map(
+                    lambda x: convert(x),
+                    value
+                ))
+            elif isinstance(value, dict):
+                result[attr] = dict(map(
+                    lambda item: (item[0], convert(item[1])),
+                    value.items()
+                ))
+            else:
+                result[attr] = convert(value)
+
+        return result
+
+    def to_str(self):
+        """Returns the string representation of the model"""
+        return pprint.pformat(self.to_dict())
+
+    def __repr__(self):
+        """For `print` and `pprint`"""
+        return self.to_str()
+
+    def __eq__(self, other):
+        """Returns true if both objects are equal"""
+        if not isinstance(other, OuterObjectWithEnumProperty):
+            return False
+
+        return self.to_dict() == other.to_dict()
+
+    def __ne__(self, other):
+        """Returns true if both objects are not equal"""
+        if not isinstance(other, OuterObjectWithEnumProperty):
+            return True
+
+        return self.to_dict() != other.to_dict()
diff --git a/samples/openapi3/client/petstore/python-legacy/test/test_outer_object_with_enum_property.py b/samples/openapi3/client/petstore/python-legacy/test/test_outer_object_with_enum_property.py
new file mode 100644
index 000000000000..81fb183aedc9
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-legacy/test/test_outer_object_with_enum_property.py
@@ -0,0 +1,52 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+from __future__ import absolute_import
+
+import unittest
+import datetime
+
+import petstore_api
+from petstore_api.models.outer_object_with_enum_property import OuterObjectWithEnumProperty  # noqa: E501
+from petstore_api.rest import ApiException
+
+class TestOuterObjectWithEnumProperty(unittest.TestCase):
+    """OuterObjectWithEnumProperty unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def make_instance(self, include_optional):
+        """Test OuterObjectWithEnumProperty
+            include_option is a boolean, when False only required
+            params are included, when True both required and
+            optional params are included """
+        # model = petstore_api.models.outer_object_with_enum_property.OuterObjectWithEnumProperty()  # noqa: E501
+        if include_optional :
+            return OuterObjectWithEnumProperty(
+                value = 2
+            )
+        else :
+            return OuterObjectWithEnumProperty(
+                value = 2,
+        )
+
+    def testOuterObjectWithEnumProperty(self):
+        """Test OuterObjectWithEnumProperty"""
+        inst_req_only = self.make_instance(include_optional=False)
+        inst_req_and_optional = self.make_instance(include_optional=True)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesClass.md
index e54a02329f1b..460813c12231 100644
--- a/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesWithArrayOfEnums.md b/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesWithArrayOfEnums.md
index 124de21cf330..49ca7b3d7540 100644
--- a/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesWithArrayOfEnums.md
+++ b/samples/openapi3/client/petstore/python/docs/AdditionalPropertiesWithArrayOfEnums.md
@@ -1,5 +1,6 @@
 # AdditionalPropertiesWithArrayOfEnums
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Address.md b/samples/openapi3/client/petstore/python/docs/Address.md
index f0699983eb7d..31b6c30f1ff8 100644
--- a/samples/openapi3/client/petstore/python/docs/Address.md
+++ b/samples/openapi3/client/petstore/python/docs/Address.md
@@ -1,5 +1,6 @@
 # Address
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Animal.md b/samples/openapi3/client/petstore/python/docs/Animal.md
index 698dc711aeb9..1d1c77c01abc 100644
--- a/samples/openapi3/client/petstore/python/docs/Animal.md
+++ b/samples/openapi3/client/petstore/python/docs/Animal.md
@@ -1,5 +1,6 @@
 # Animal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/AnimalFarm.md b/samples/openapi3/client/petstore/python/docs/AnimalFarm.md
index 0717b5d7df1f..fc299cf27d34 100644
--- a/samples/openapi3/client/petstore/python/docs/AnimalFarm.md
+++ b/samples/openapi3/client/petstore/python/docs/AnimalFarm.md
@@ -1,5 +1,6 @@
 # AnimalFarm
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md b/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md
index 402031d6beef..043aa7d5dba8 100644
--- a/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md
+++ b/samples/openapi3/client/petstore/python/docs/AnotherFakeApi.md
@@ -46,6 +46,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling AnotherFakeApi->call_123_test_special_tags: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -65,6 +66,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/ApiResponse.md b/samples/openapi3/client/petstore/python/docs/ApiResponse.md
index 8fc302305abe..81a7d0d85227 100644
--- a/samples/openapi3/client/petstore/python/docs/ApiResponse.md
+++ b/samples/openapi3/client/petstore/python/docs/ApiResponse.md
@@ -1,5 +1,6 @@
 # ApiResponse
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Apple.md b/samples/openapi3/client/petstore/python/docs/Apple.md
index bf729dc74527..d8ba5ec0711b 100644
--- a/samples/openapi3/client/petstore/python/docs/Apple.md
+++ b/samples/openapi3/client/petstore/python/docs/Apple.md
@@ -1,5 +1,6 @@
 # Apple
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/AppleReq.md b/samples/openapi3/client/petstore/python/docs/AppleReq.md
index 03370bdb9685..b50f701a3d86 100644
--- a/samples/openapi3/client/petstore/python/docs/AppleReq.md
+++ b/samples/openapi3/client/petstore/python/docs/AppleReq.md
@@ -1,5 +1,6 @@
 # AppleReq
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
index 1a68df0090bb..6ab77963788b 100644
--- a/samples/openapi3/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python/docs/ArrayOfArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ArrayOfEnums.md b/samples/openapi3/client/petstore/python/docs/ArrayOfEnums.md
index 8a1dfca693ae..d2f8ea80a3d9 100644
--- a/samples/openapi3/client/petstore/python/docs/ArrayOfEnums.md
+++ b/samples/openapi3/client/petstore/python/docs/ArrayOfEnums.md
@@ -1,5 +1,6 @@
 # ArrayOfEnums
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ArrayOfNumberOnly.md b/samples/openapi3/client/petstore/python/docs/ArrayOfNumberOnly.md
index b8a760f56dc2..ebc65a54ba7e 100644
--- a/samples/openapi3/client/petstore/python/docs/ArrayOfNumberOnly.md
+++ b/samples/openapi3/client/petstore/python/docs/ArrayOfNumberOnly.md
@@ -1,5 +1,6 @@
 # ArrayOfNumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ArrayTest.md b/samples/openapi3/client/petstore/python/docs/ArrayTest.md
index b94f23fd2271..4e1bda8fc3af 100644
--- a/samples/openapi3/client/petstore/python/docs/ArrayTest.md
+++ b/samples/openapi3/client/petstore/python/docs/ArrayTest.md
@@ -1,5 +1,6 @@
 # ArrayTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Banana.md b/samples/openapi3/client/petstore/python/docs/Banana.md
index 5a5364538baf..54e06a1de596 100644
--- a/samples/openapi3/client/petstore/python/docs/Banana.md
+++ b/samples/openapi3/client/petstore/python/docs/Banana.md
@@ -1,5 +1,6 @@
 # Banana
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/BananaReq.md b/samples/openapi3/client/petstore/python/docs/BananaReq.md
index 804f9f11eb0b..737552882190 100644
--- a/samples/openapi3/client/petstore/python/docs/BananaReq.md
+++ b/samples/openapi3/client/petstore/python/docs/BananaReq.md
@@ -1,5 +1,6 @@
 # BananaReq
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/BasquePig.md b/samples/openapi3/client/petstore/python/docs/BasquePig.md
index 5c8a32525299..6c583c5bc9f5 100644
--- a/samples/openapi3/client/petstore/python/docs/BasquePig.md
+++ b/samples/openapi3/client/petstore/python/docs/BasquePig.md
@@ -1,5 +1,6 @@
 # BasquePig
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Capitalization.md b/samples/openapi3/client/petstore/python/docs/Capitalization.md
index 85d88d239ee7..1ddeadeb3f46 100644
--- a/samples/openapi3/client/petstore/python/docs/Capitalization.md
+++ b/samples/openapi3/client/petstore/python/docs/Capitalization.md
@@ -1,5 +1,6 @@
 # Capitalization
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Cat.md b/samples/openapi3/client/petstore/python/docs/Cat.md
index 86f6c0e11dcf..082715a28421 100644
--- a/samples/openapi3/client/petstore/python/docs/Cat.md
+++ b/samples/openapi3/client/petstore/python/docs/Cat.md
@@ -1,5 +1,6 @@
 # Cat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/CatAllOf.md b/samples/openapi3/client/petstore/python/docs/CatAllOf.md
index 35434374fc97..0ff7809a99ac 100644
--- a/samples/openapi3/client/petstore/python/docs/CatAllOf.md
+++ b/samples/openapi3/client/petstore/python/docs/CatAllOf.md
@@ -1,5 +1,6 @@
 # CatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Category.md b/samples/openapi3/client/petstore/python/docs/Category.md
index 287225d66fd7..940f6a45e641 100644
--- a/samples/openapi3/client/petstore/python/docs/Category.md
+++ b/samples/openapi3/client/petstore/python/docs/Category.md
@@ -1,5 +1,6 @@
 # Category
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ChildCat.md b/samples/openapi3/client/petstore/python/docs/ChildCat.md
index d39ee461163f..513903ac5793 100644
--- a/samples/openapi3/client/petstore/python/docs/ChildCat.md
+++ b/samples/openapi3/client/petstore/python/docs/ChildCat.md
@@ -1,5 +1,6 @@
 # ChildCat
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ChildCatAllOf.md b/samples/openapi3/client/petstore/python/docs/ChildCatAllOf.md
index f48345511c10..c5883b9a87c8 100644
--- a/samples/openapi3/client/petstore/python/docs/ChildCatAllOf.md
+++ b/samples/openapi3/client/petstore/python/docs/ChildCatAllOf.md
@@ -1,5 +1,6 @@
 # ChildCatAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ClassModel.md b/samples/openapi3/client/petstore/python/docs/ClassModel.md
index 657d51a944de..48ed7cbf2ff0 100644
--- a/samples/openapi3/client/petstore/python/docs/ClassModel.md
+++ b/samples/openapi3/client/petstore/python/docs/ClassModel.md
@@ -1,6 +1,7 @@
 # ClassModel
 
 Model for testing model with \"_class\" property
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Client.md b/samples/openapi3/client/petstore/python/docs/Client.md
index 88e99384f92c..c3986008d6c3 100644
--- a/samples/openapi3/client/petstore/python/docs/Client.md
+++ b/samples/openapi3/client/petstore/python/docs/Client.md
@@ -1,5 +1,6 @@
 # Client
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md b/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
index 672d5c2acb03..d9fef9ca283b 100644
--- a/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/ComplexQuadrilateral.md
@@ -1,5 +1,6 @@
 # ComplexQuadrilateral
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md b/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
index 4fb32a02cf6d..14c3f2ea4933 100644
--- a/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
+++ b/samples/openapi3/client/petstore/python/docs/ComposedOneOfNumberWithValidations.md
@@ -1,6 +1,7 @@
 # ComposedOneOfNumberWithValidations
 
 this is a model that allows payloads of type object or number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/DanishPig.md b/samples/openapi3/client/petstore/python/docs/DanishPig.md
index 5501dc6b7c5a..dd7fe16ea4a9 100644
--- a/samples/openapi3/client/petstore/python/docs/DanishPig.md
+++ b/samples/openapi3/client/petstore/python/docs/DanishPig.md
@@ -1,5 +1,6 @@
 # DanishPig
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/DefaultApi.md b/samples/openapi3/client/petstore/python/docs/DefaultApi.md
index 3fffa95ff343..08052341aee1 100644
--- a/samples/openapi3/client/petstore/python/docs/DefaultApi.md
+++ b/samples/openapi3/client/petstore/python/docs/DefaultApi.md
@@ -40,6 +40,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling DefaultApi->foo_get: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -56,6 +57,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/Dog.md b/samples/openapi3/client/petstore/python/docs/Dog.md
index fa9568060923..51b5b32bdacb 100644
--- a/samples/openapi3/client/petstore/python/docs/Dog.md
+++ b/samples/openapi3/client/petstore/python/docs/Dog.md
@@ -1,5 +1,6 @@
 # Dog
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/DogAllOf.md b/samples/openapi3/client/petstore/python/docs/DogAllOf.md
index 36d3216f7b35..6382bbd80671 100644
--- a/samples/openapi3/client/petstore/python/docs/DogAllOf.md
+++ b/samples/openapi3/client/petstore/python/docs/DogAllOf.md
@@ -1,5 +1,6 @@
 # DogAllOf
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Drawing.md b/samples/openapi3/client/petstore/python/docs/Drawing.md
index 73500bc0c5d3..0f0390a3f720 100644
--- a/samples/openapi3/client/petstore/python/docs/Drawing.md
+++ b/samples/openapi3/client/petstore/python/docs/Drawing.md
@@ -1,5 +1,6 @@
 # Drawing
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/EnumArrays.md b/samples/openapi3/client/petstore/python/docs/EnumArrays.md
index e0b5582e9d5b..9be5c645a809 100644
--- a/samples/openapi3/client/petstore/python/docs/EnumArrays.md
+++ b/samples/openapi3/client/petstore/python/docs/EnumArrays.md
@@ -1,5 +1,6 @@
 # EnumArrays
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/EnumClass.md b/samples/openapi3/client/petstore/python/docs/EnumClass.md
index 6dda7fd8a77f..a1f9aae58190 100644
--- a/samples/openapi3/client/petstore/python/docs/EnumClass.md
+++ b/samples/openapi3/client/petstore/python/docs/EnumClass.md
@@ -1,5 +1,6 @@
 # EnumClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/EnumTest.md b/samples/openapi3/client/petstore/python/docs/EnumTest.md
index 706c1ebf0ecb..b9181858434c 100644
--- a/samples/openapi3/client/petstore/python/docs/EnumTest.md
+++ b/samples/openapi3/client/petstore/python/docs/EnumTest.md
@@ -1,5 +1,6 @@
 # EnumTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md b/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
index e73229ddc462..2766ad71cefc 100644
--- a/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/EquilateralTriangle.md
@@ -1,5 +1,6 @@
 # EquilateralTriangle
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/FakeApi.md b/samples/openapi3/client/petstore/python/docs/FakeApi.md
index a8efca889708..ea6886d682b1 100644
--- a/samples/openapi3/client/petstore/python/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python/docs/FakeApi.md
@@ -71,6 +71,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->additional_properties_with_array_of_enums: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -90,6 +91,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -136,6 +138,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->array_model: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -155,6 +158,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -200,6 +204,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->array_of_enums: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -219,6 +224,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -262,6 +268,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->boolean: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -281,6 +288,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -325,6 +333,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->composed_one_of_number_with_validations: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -344,6 +353,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -385,6 +395,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->download_attachment: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -404,6 +415,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: text/plain
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -463,6 +475,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->enum_test: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -482,6 +495,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -523,6 +537,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->fake_health_get: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -539,6 +554,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -586,6 +602,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->mammal: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -605,6 +622,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -649,6 +667,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->number_with_validations: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -668,6 +687,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -716,6 +736,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->object_model_with_ref_props: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -735,6 +756,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -778,6 +800,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->string: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -797,6 +820,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -841,6 +865,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->string_enum: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -860,6 +885,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -911,6 +937,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_body_with_file_schema: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -930,6 +957,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -984,6 +1012,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_body_with_query_params: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1004,6 +1033,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1050,6 +1080,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_client_model: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1069,6 +1100,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1143,6 +1175,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling FakeApi->test_endpoint_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1175,6 +1208,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1230,6 +1264,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_enum_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1256,6 +1291,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1322,6 +1358,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling FakeApi->test_group_parameters: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1346,6 +1383,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1388,6 +1426,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_inline_additional_properties: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1407,6 +1446,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1448,6 +1488,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_json_form_data: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1468,6 +1509,7 @@ No authorization required
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1523,6 +1565,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->test_query_parameter_collection_format: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1546,6 +1589,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1587,6 +1631,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->upload_download_file: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1606,6 +1651,7 @@ No authorization required
  - **Content-Type**: application/octet-stream
  - **Accept**: application/octet-stream
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1658,6 +1704,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->upload_file: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1678,6 +1725,7 @@ No authorization required
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -1721,6 +1769,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling FakeApi->upload_files: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -1740,6 +1789,7 @@ No authorization required
  - **Content-Type**: multipart/form-data
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
index e7a43d577d88..a00c272201f5 100644
--- a/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
+++ b/samples/openapi3/client/petstore/python/docs/FakeClassnameTags123Api.md
@@ -57,6 +57,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling FakeClassnameTags123Api->test_classname: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -76,6 +77,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: application/json
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/File.md b/samples/openapi3/client/petstore/python/docs/File.md
index f17ba0057d04..63b1d1a65186 100644
--- a/samples/openapi3/client/petstore/python/docs/File.md
+++ b/samples/openapi3/client/petstore/python/docs/File.md
@@ -1,6 +1,7 @@
 # File
 
 Must be named `File` for test.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/FileSchemaTestClass.md b/samples/openapi3/client/petstore/python/docs/FileSchemaTestClass.md
index d0a8bbaaba95..caf2440821da 100644
--- a/samples/openapi3/client/petstore/python/docs/FileSchemaTestClass.md
+++ b/samples/openapi3/client/petstore/python/docs/FileSchemaTestClass.md
@@ -1,5 +1,6 @@
 # FileSchemaTestClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Foo.md b/samples/openapi3/client/petstore/python/docs/Foo.md
index 3e9080e7f48a..23fb5e1678ed 100644
--- a/samples/openapi3/client/petstore/python/docs/Foo.md
+++ b/samples/openapi3/client/petstore/python/docs/Foo.md
@@ -1,5 +1,6 @@
 # Foo
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/FormatTest.md b/samples/openapi3/client/petstore/python/docs/FormatTest.md
index 18e7d495e0f5..4fcec135190f 100644
--- a/samples/openapi3/client/petstore/python/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/python/docs/FormatTest.md
@@ -1,5 +1,6 @@
 # FormatTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Fruit.md b/samples/openapi3/client/petstore/python/docs/Fruit.md
index 9a15349d34b5..92700e79e084 100644
--- a/samples/openapi3/client/petstore/python/docs/Fruit.md
+++ b/samples/openapi3/client/petstore/python/docs/Fruit.md
@@ -1,5 +1,6 @@
 # Fruit
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/FruitReq.md b/samples/openapi3/client/petstore/python/docs/FruitReq.md
index edb522537ddd..7ff54d6ae022 100644
--- a/samples/openapi3/client/petstore/python/docs/FruitReq.md
+++ b/samples/openapi3/client/petstore/python/docs/FruitReq.md
@@ -1,5 +1,6 @@
 # FruitReq
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/GmFruit.md b/samples/openapi3/client/petstore/python/docs/GmFruit.md
index b5ec2fba3a04..f2af2abe5cef 100644
--- a/samples/openapi3/client/petstore/python/docs/GmFruit.md
+++ b/samples/openapi3/client/petstore/python/docs/GmFruit.md
@@ -1,5 +1,6 @@
 # GmFruit
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/GrandparentAnimal.md b/samples/openapi3/client/petstore/python/docs/GrandparentAnimal.md
index 2a9d89c76d95..15db0708bb1a 100644
--- a/samples/openapi3/client/petstore/python/docs/GrandparentAnimal.md
+++ b/samples/openapi3/client/petstore/python/docs/GrandparentAnimal.md
@@ -1,5 +1,6 @@
 # GrandparentAnimal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/HasOnlyReadOnly.md b/samples/openapi3/client/petstore/python/docs/HasOnlyReadOnly.md
index f731a42eab54..0e1334519a8b 100644
--- a/samples/openapi3/client/petstore/python/docs/HasOnlyReadOnly.md
+++ b/samples/openapi3/client/petstore/python/docs/HasOnlyReadOnly.md
@@ -1,5 +1,6 @@
 # HasOnlyReadOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/HealthCheckResult.md b/samples/openapi3/client/petstore/python/docs/HealthCheckResult.md
index 50cf84f69133..ab8b660e667f 100644
--- a/samples/openapi3/client/petstore/python/docs/HealthCheckResult.md
+++ b/samples/openapi3/client/petstore/python/docs/HealthCheckResult.md
@@ -1,6 +1,7 @@
 # HealthCheckResult
 
 Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/InlineResponseDefault.md b/samples/openapi3/client/petstore/python/docs/InlineResponseDefault.md
index 9c754420f24a..f0a52bc4639c 100644
--- a/samples/openapi3/client/petstore/python/docs/InlineResponseDefault.md
+++ b/samples/openapi3/client/petstore/python/docs/InlineResponseDefault.md
@@ -1,5 +1,6 @@
 # InlineResponseDefault
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/IntegerEnum.md b/samples/openapi3/client/petstore/python/docs/IntegerEnum.md
index 9ef38c07047b..9567a76cc2e2 100644
--- a/samples/openapi3/client/petstore/python/docs/IntegerEnum.md
+++ b/samples/openapi3/client/petstore/python/docs/IntegerEnum.md
@@ -1,5 +1,6 @@
 # IntegerEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/IntegerEnumOneValue.md b/samples/openapi3/client/petstore/python/docs/IntegerEnumOneValue.md
index dda321694f53..99dcaa7a4ec3 100644
--- a/samples/openapi3/client/petstore/python/docs/IntegerEnumOneValue.md
+++ b/samples/openapi3/client/petstore/python/docs/IntegerEnumOneValue.md
@@ -1,5 +1,6 @@
 # IntegerEnumOneValue
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/IntegerEnumWithDefaultValue.md b/samples/openapi3/client/petstore/python/docs/IntegerEnumWithDefaultValue.md
index 9988294c0373..4b8e39d9cadd 100644
--- a/samples/openapi3/client/petstore/python/docs/IntegerEnumWithDefaultValue.md
+++ b/samples/openapi3/client/petstore/python/docs/IntegerEnumWithDefaultValue.md
@@ -1,5 +1,6 @@
 # IntegerEnumWithDefaultValue
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md b/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
index e80ec0983a55..e7fffa3be03a 100644
--- a/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/IsoscelesTriangle.md
@@ -1,5 +1,6 @@
 # IsoscelesTriangle
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/List.md b/samples/openapi3/client/petstore/python/docs/List.md
index 11f4f3a05f32..4b60956971aa 100644
--- a/samples/openapi3/client/petstore/python/docs/List.md
+++ b/samples/openapi3/client/petstore/python/docs/List.md
@@ -1,5 +1,6 @@
 # List
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Mammal.md b/samples/openapi3/client/petstore/python/docs/Mammal.md
index 3ad5538e6e7e..4d9d8cc52040 100644
--- a/samples/openapi3/client/petstore/python/docs/Mammal.md
+++ b/samples/openapi3/client/petstore/python/docs/Mammal.md
@@ -1,5 +1,6 @@
 # Mammal
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/MapTest.md b/samples/openapi3/client/petstore/python/docs/MapTest.md
index ad561b7220bf..15228ee1f282 100644
--- a/samples/openapi3/client/petstore/python/docs/MapTest.md
+++ b/samples/openapi3/client/petstore/python/docs/MapTest.md
@@ -1,5 +1,6 @@
 # MapTest
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 1484c0638d83..f489944a20af 100644
--- a/samples/openapi3/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/python/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -1,5 +1,6 @@
 # MixedPropertiesAndAdditionalPropertiesClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Model200Response.md b/samples/openapi3/client/petstore/python/docs/Model200Response.md
index 40d0d7828e14..c958bd4b33f8 100644
--- a/samples/openapi3/client/petstore/python/docs/Model200Response.md
+++ b/samples/openapi3/client/petstore/python/docs/Model200Response.md
@@ -1,6 +1,7 @@
 # Model200Response
 
 Model for testing model name starting with number
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ModelReturn.md b/samples/openapi3/client/petstore/python/docs/ModelReturn.md
index 65ec73ddae78..043e9d466fab 100644
--- a/samples/openapi3/client/petstore/python/docs/ModelReturn.md
+++ b/samples/openapi3/client/petstore/python/docs/ModelReturn.md
@@ -1,6 +1,7 @@
 # ModelReturn
 
 Model for testing reserved words
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Name.md b/samples/openapi3/client/petstore/python/docs/Name.md
index 807b76afc6ee..3be719cdbfba 100644
--- a/samples/openapi3/client/petstore/python/docs/Name.md
+++ b/samples/openapi3/client/petstore/python/docs/Name.md
@@ -1,6 +1,7 @@
 # Name
 
 Model for testing model name same as property name
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/NullableClass.md b/samples/openapi3/client/petstore/python/docs/NullableClass.md
index 0789eb8ad1a4..863e93ddfbbc 100644
--- a/samples/openapi3/client/petstore/python/docs/NullableClass.md
+++ b/samples/openapi3/client/petstore/python/docs/NullableClass.md
@@ -1,5 +1,6 @@
 # NullableClass
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/NullableShape.md b/samples/openapi3/client/petstore/python/docs/NullableShape.md
index 12ef6d7f743e..a1c658a39346 100644
--- a/samples/openapi3/client/petstore/python/docs/NullableShape.md
+++ b/samples/openapi3/client/petstore/python/docs/NullableShape.md
@@ -1,6 +1,7 @@
 # NullableShape
 
 The value may be a shape or the 'null' value. The 'nullable' attribute was introduced in OAS schema >= 3.0 and has been deprecated in OAS schema >= 3.1.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/NumberOnly.md b/samples/openapi3/client/petstore/python/docs/NumberOnly.md
index 93a0fde7b931..37195c5d8994 100644
--- a/samples/openapi3/client/petstore/python/docs/NumberOnly.md
+++ b/samples/openapi3/client/petstore/python/docs/NumberOnly.md
@@ -1,5 +1,6 @@
 # NumberOnly
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/NumberWithValidations.md b/samples/openapi3/client/petstore/python/docs/NumberWithValidations.md
index 402eb8325bc7..119e0f678239 100644
--- a/samples/openapi3/client/petstore/python/docs/NumberWithValidations.md
+++ b/samples/openapi3/client/petstore/python/docs/NumberWithValidations.md
@@ -1,5 +1,6 @@
 # NumberWithValidations
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ObjectInterface.md b/samples/openapi3/client/petstore/python/docs/ObjectInterface.md
index 753c9aad26e9..ee5bc32898be 100644
--- a/samples/openapi3/client/petstore/python/docs/ObjectInterface.md
+++ b/samples/openapi3/client/petstore/python/docs/ObjectInterface.md
@@ -1,5 +1,6 @@
 # ObjectInterface
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ObjectModelWithRefProps.md b/samples/openapi3/client/petstore/python/docs/ObjectModelWithRefProps.md
index 9a94ef8f61cc..5ff4e52033d6 100644
--- a/samples/openapi3/client/petstore/python/docs/ObjectModelWithRefProps.md
+++ b/samples/openapi3/client/petstore/python/docs/ObjectModelWithRefProps.md
@@ -1,6 +1,7 @@
 # ObjectModelWithRefProps
 
 a model that includes properties which should stay primitive (String + Boolean) and one which is defined as a class, NumberWithValidations
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ObjectWithValidations.md b/samples/openapi3/client/petstore/python/docs/ObjectWithValidations.md
index 831144ab0539..9d3e2de12a1c 100644
--- a/samples/openapi3/client/petstore/python/docs/ObjectWithValidations.md
+++ b/samples/openapi3/client/petstore/python/docs/ObjectWithValidations.md
@@ -1,5 +1,6 @@
 # ObjectWithValidations
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Order.md b/samples/openapi3/client/petstore/python/docs/Order.md
index c21210a3bd59..d29e1a381de8 100644
--- a/samples/openapi3/client/petstore/python/docs/Order.md
+++ b/samples/openapi3/client/petstore/python/docs/Order.md
@@ -1,5 +1,6 @@
 # Order
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ParentPet.md b/samples/openapi3/client/petstore/python/docs/ParentPet.md
index 6e2571150d04..111ada88b3d1 100644
--- a/samples/openapi3/client/petstore/python/docs/ParentPet.md
+++ b/samples/openapi3/client/petstore/python/docs/ParentPet.md
@@ -1,5 +1,6 @@
 # ParentPet
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Pet.md b/samples/openapi3/client/petstore/python/docs/Pet.md
index 1d3349fa9b43..ea4abdeb13d3 100644
--- a/samples/openapi3/client/petstore/python/docs/Pet.md
+++ b/samples/openapi3/client/petstore/python/docs/Pet.md
@@ -1,6 +1,7 @@
 # Pet
 
 Pet object that needs to be added to the store
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/PetApi.md b/samples/openapi3/client/petstore/python/docs/PetApi.md
index 87aa32e25a88..7486621b5e21 100644
--- a/samples/openapi3/client/petstore/python/docs/PetApi.md
+++ b/samples/openapi3/client/petstore/python/docs/PetApi.md
@@ -135,6 +135,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->add_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -154,6 +155,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -214,6 +216,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->delete_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -234,6 +237,7 @@ void (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -351,6 +355,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->find_pets_by_status: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -370,6 +375,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -486,6 +492,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->find_pets_by_tags: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -505,6 +512,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -561,6 +569,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->get_pet_by_id: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -580,6 +589,7 @@ Name | Type | Description  | Notes
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -711,6 +721,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->update_pet: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -730,6 +741,7 @@ void (empty response body)
  - **Content-Type**: application/json, application/xml
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -793,6 +805,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling PetApi->update_pet_with_form: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -814,6 +827,7 @@ void (empty response body)
  - **Content-Type**: application/x-www-form-urlencoded
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/Pig.md b/samples/openapi3/client/petstore/python/docs/Pig.md
index bebdd38f9011..30b4d17f60ce 100644
--- a/samples/openapi3/client/petstore/python/docs/Pig.md
+++ b/samples/openapi3/client/petstore/python/docs/Pig.md
@@ -1,5 +1,6 @@
 # Pig
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Quadrilateral.md b/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
index 58f91c19b66c..7418ca26b451 100644
--- a/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/Quadrilateral.md
@@ -1,5 +1,6 @@
 # Quadrilateral
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/QuadrilateralInterface.md b/samples/openapi3/client/petstore/python/docs/QuadrilateralInterface.md
index 25d744665176..3b9c39d22306 100644
--- a/samples/openapi3/client/petstore/python/docs/QuadrilateralInterface.md
+++ b/samples/openapi3/client/petstore/python/docs/QuadrilateralInterface.md
@@ -1,5 +1,6 @@
 # QuadrilateralInterface
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ReadOnlyFirst.md b/samples/openapi3/client/petstore/python/docs/ReadOnlyFirst.md
index 6bc1447c1d71..53b4c61d8445 100644
--- a/samples/openapi3/client/petstore/python/docs/ReadOnlyFirst.md
+++ b/samples/openapi3/client/petstore/python/docs/ReadOnlyFirst.md
@@ -1,5 +1,6 @@
 # ReadOnlyFirst
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md b/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
index 8b5b5ff85589..0910a264c00a 100644
--- a/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
+++ b/samples/openapi3/client/petstore/python/docs/ScaleneTriangle.md
@@ -1,5 +1,6 @@
 # ScaleneTriangle
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Shape.md b/samples/openapi3/client/petstore/python/docs/Shape.md
index 0c056f0d1daf..fe458b1df03a 100644
--- a/samples/openapi3/client/petstore/python/docs/Shape.md
+++ b/samples/openapi3/client/petstore/python/docs/Shape.md
@@ -1,5 +1,6 @@
 # Shape
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ShapeInterface.md b/samples/openapi3/client/petstore/python/docs/ShapeInterface.md
index 224a2faa1dd4..4d094158faba 100644
--- a/samples/openapi3/client/petstore/python/docs/ShapeInterface.md
+++ b/samples/openapi3/client/petstore/python/docs/ShapeInterface.md
@@ -1,5 +1,6 @@
 # ShapeInterface
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md b/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
index 31510011fb54..ee3fbbdcb25b 100644
--- a/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
+++ b/samples/openapi3/client/petstore/python/docs/ShapeOrNull.md
@@ -1,6 +1,7 @@
 # ShapeOrNull
 
 The value may be a shape or the 'null' value. This is introduced in OAS schema >= 3.1.
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md b/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
index ec38088e781f..13672f48c961 100644
--- a/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
+++ b/samples/openapi3/client/petstore/python/docs/SimpleQuadrilateral.md
@@ -1,5 +1,6 @@
 # SimpleQuadrilateral
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/SomeObject.md b/samples/openapi3/client/petstore/python/docs/SomeObject.md
index eb225fb05d2f..8b3723863e52 100644
--- a/samples/openapi3/client/petstore/python/docs/SomeObject.md
+++ b/samples/openapi3/client/petstore/python/docs/SomeObject.md
@@ -1,5 +1,6 @@
 # SomeObject
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/SpecialModelName.md b/samples/openapi3/client/petstore/python/docs/SpecialModelName.md
index 022ee19169ce..268e1134192d 100644
--- a/samples/openapi3/client/petstore/python/docs/SpecialModelName.md
+++ b/samples/openapi3/client/petstore/python/docs/SpecialModelName.md
@@ -1,5 +1,6 @@
 # SpecialModelName
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/StoreApi.md b/samples/openapi3/client/petstore/python/docs/StoreApi.md
index c052c02c9b45..3ceceacf1ad3 100644
--- a/samples/openapi3/client/petstore/python/docs/StoreApi.md
+++ b/samples/openapi3/client/petstore/python/docs/StoreApi.md
@@ -45,6 +45,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->delete_order: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -64,6 +65,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -118,6 +120,7 @@ with petstore_api.ApiClient(configuration) as api_client:
         print("Exception when calling StoreApi->get_inventory: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -134,6 +137,7 @@ This endpoint does not need any parameter.
  - **Content-Type**: Not defined
  - **Accept**: application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -178,6 +182,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->get_order_by_id: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -197,6 +202,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -248,6 +254,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling StoreApi->place_order: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -267,6 +274,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/StringBooleanMap.md b/samples/openapi3/client/petstore/python/docs/StringBooleanMap.md
index 2fbf3b3767d0..217c79704081 100644
--- a/samples/openapi3/client/petstore/python/docs/StringBooleanMap.md
+++ b/samples/openapi3/client/petstore/python/docs/StringBooleanMap.md
@@ -1,5 +1,6 @@
 # StringBooleanMap
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/StringEnum.md b/samples/openapi3/client/petstore/python/docs/StringEnum.md
index 4c00bc4ad9dd..b03f3b1e6c64 100644
--- a/samples/openapi3/client/petstore/python/docs/StringEnum.md
+++ b/samples/openapi3/client/petstore/python/docs/StringEnum.md
@@ -1,5 +1,6 @@
 # StringEnum
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/StringEnumWithDefaultValue.md b/samples/openapi3/client/petstore/python/docs/StringEnumWithDefaultValue.md
index 13cc075ab34e..7799b93d8223 100644
--- a/samples/openapi3/client/petstore/python/docs/StringEnumWithDefaultValue.md
+++ b/samples/openapi3/client/petstore/python/docs/StringEnumWithDefaultValue.md
@@ -1,5 +1,6 @@
 # StringEnumWithDefaultValue
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Tag.md b/samples/openapi3/client/petstore/python/docs/Tag.md
index 243cd98eda69..4ccac4949afc 100644
--- a/samples/openapi3/client/petstore/python/docs/Tag.md
+++ b/samples/openapi3/client/petstore/python/docs/Tag.md
@@ -1,5 +1,6 @@
 # Tag
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Triangle.md b/samples/openapi3/client/petstore/python/docs/Triangle.md
index f86e2ede108c..85e1d6bb437d 100644
--- a/samples/openapi3/client/petstore/python/docs/Triangle.md
+++ b/samples/openapi3/client/petstore/python/docs/Triangle.md
@@ -1,5 +1,6 @@
 # Triangle
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/TriangleInterface.md b/samples/openapi3/client/petstore/python/docs/TriangleInterface.md
index 901553d663a8..494c224cd313 100644
--- a/samples/openapi3/client/petstore/python/docs/TriangleInterface.md
+++ b/samples/openapi3/client/petstore/python/docs/TriangleInterface.md
@@ -1,5 +1,6 @@
 # TriangleInterface
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/User.md b/samples/openapi3/client/petstore/python/docs/User.md
index 5fc54dce871b..a4cb117e63a9 100644
--- a/samples/openapi3/client/petstore/python/docs/User.md
+++ b/samples/openapi3/client/petstore/python/docs/User.md
@@ -1,5 +1,6 @@
 # User
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/UserApi.md b/samples/openapi3/client/petstore/python/docs/UserApi.md
index 59eeff9a3366..e3511719d56f 100644
--- a/samples/openapi3/client/petstore/python/docs/UserApi.md
+++ b/samples/openapi3/client/petstore/python/docs/UserApi.md
@@ -63,6 +63,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -82,6 +83,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -138,6 +140,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_users_with_array_input: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -157,6 +160,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -213,6 +217,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->create_users_with_list_input: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -232,6 +237,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -274,6 +280,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->delete_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -293,6 +300,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -336,6 +344,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->get_user_by_name: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -355,6 +364,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -399,6 +409,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->login_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -419,6 +430,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: application/xml, application/json
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -459,6 +471,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->logout_user: %s\n" % e)
 ```
 
+
 ### Parameters
 This endpoint does not need any parameter.
 
@@ -475,6 +488,7 @@ No authorization required
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
@@ -532,6 +546,7 @@ with petstore_api.ApiClient() as api_client:
         print("Exception when calling UserApi->update_user: %s\n" % e)
 ```
 
+
 ### Parameters
 
 Name | Type | Description  | Notes
@@ -552,6 +567,7 @@ No authorization required
  - **Content-Type**: application/json
  - **Accept**: Not defined
 
+
 ### HTTP response details
 | Status code | Description | Response headers |
 |-------------|-------------|------------------|
diff --git a/samples/openapi3/client/petstore/python/docs/Whale.md b/samples/openapi3/client/petstore/python/docs/Whale.md
index 693dacb158b7..ea48bff6bc39 100644
--- a/samples/openapi3/client/petstore/python/docs/Whale.md
+++ b/samples/openapi3/client/petstore/python/docs/Whale.md
@@ -1,5 +1,6 @@
 # Whale
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/openapi3/client/petstore/python/docs/Zebra.md b/samples/openapi3/client/petstore/python/docs/Zebra.md
index 7681f694685a..980d8d98e904 100644
--- a/samples/openapi3/client/petstore/python/docs/Zebra.md
+++ b/samples/openapi3/client/petstore/python/docs/Zebra.md
@@ -1,5 +1,6 @@
 # Zebra
 
+
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
diff --git a/samples/schema/petstore/mysql/.openapi-generator/FILES b/samples/schema/petstore/mysql/.openapi-generator/FILES
index 5902ce6da7ef..7b909264badf 100644
--- a/samples/schema/petstore/mysql/.openapi-generator/FILES
+++ b/samples/schema/petstore/mysql/.openapi-generator/FILES
@@ -35,6 +35,7 @@ Model/OuterEnum.sql
 Model/OuterEnumDefaultValue.sql
 Model/OuterEnumInteger.sql
 Model/OuterEnumIntegerDefaultValue.sql
+Model/OuterObjectWithEnumProperty.sql
 Model/Pet.sql
 Model/ReadOnlyFirst.sql
 Model/Return.sql
diff --git a/samples/schema/petstore/mysql/Model/OuterObjectWithEnumProperty.sql b/samples/schema/petstore/mysql/Model/OuterObjectWithEnumProperty.sql
new file mode 100644
index 000000000000..0c3c627761c3
--- /dev/null
+++ b/samples/schema/petstore/mysql/Model/OuterObjectWithEnumProperty.sql
@@ -0,0 +1,26 @@
+--
+-- OpenAPI Petstore.
+-- Prepared SQL queries for 'OuterObjectWithEnumProperty' definition.
+--
+
+
+--
+-- SELECT template for table `OuterObjectWithEnumProperty`
+--
+SELECT `value` FROM `OuterObjectWithEnumProperty` WHERE 1;
+
+--
+-- INSERT template for table `OuterObjectWithEnumProperty`
+--
+INSERT INTO `OuterObjectWithEnumProperty`(`value`) VALUES (?);
+
+--
+-- UPDATE template for table `OuterObjectWithEnumProperty`
+--
+UPDATE `OuterObjectWithEnumProperty` SET `value` = ? WHERE 1;
+
+--
+-- DELETE template for table `OuterObjectWithEnumProperty`
+--
+DELETE FROM `OuterObjectWithEnumProperty` WHERE 0;
+
diff --git a/samples/schema/petstore/mysql/mysql_schema.sql b/samples/schema/petstore/mysql/mysql_schema.sql
index e2cb414ed44d..91c69dcfcf0c 100644
--- a/samples/schema/petstore/mysql/mysql_schema.sql
+++ b/samples/schema/petstore/mysql/mysql_schema.sql
@@ -334,6 +334,14 @@ CREATE TABLE IF NOT EXISTS `OuterComposite` (
   `my_boolean` TINYINT(1) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
+--
+-- Table structure for table `OuterObjectWithEnumProperty` generated from model 'OuterObjectWithEnumProperty'
+--
+
+CREATE TABLE IF NOT EXISTS `OuterObjectWithEnumProperty` (
+  `value` TEXT NOT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
 --
 -- Table structure for table `Pet` generated from model 'Pet'
 --
diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index abb035c92cbb..41aaf28f1c31 100644
--- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>4bc22b76-ee61-45c3-aae6-47cee9badaa0</UserSecretsId>
@@ -17,6 +18,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
+    <PackageReference Include="JsonSubTypes" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />-->
diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 7668438e876a..b366d930680a 100644
--- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>4ddd97dd-77ed-459e-8cd0-dcb2f9e59a70</UserSecretsId>
@@ -17,6 +18,7 @@
     <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="5.0.0"/>
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0" />
+    <PackageReference Include="JsonSubTypes" Version="1.8.0" />
   </ItemGroup>
   <ItemGroup>
     <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />-->
diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 49e482baaeee..18d7e89c40d6 100644
--- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
     <UserSecretsId>962d9e18-9555-468a-ab9d-0fb03e258878</UserSecretsId>
diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
index 63ecd64a4507..0c249b1cb982 100644
--- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
+++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Org.OpenAPITools.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PreserveCompilationContext>true</PreserveCompilationContext>
+    <Version>1.0.0</Version>
     <AssemblyName>Org.OpenAPITools</AssemblyName>
     <PackageId>Org.OpenAPITools</PackageId>
   </PropertyGroup>
diff --git a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION
index d99e7162d01f..c30f0ec2be7f 100644
--- a/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION
+++ b/samples/server/petstore/cpp-pistache/.openapi-generator/VERSION
@@ -1 +1 @@
-5.0.0-SNAPSHOT
\ No newline at end of file
+5.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp b/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
index 77cd466e145f..4b9ca7419208 100644
--- a/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
+++ b/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
@@ -47,6 +47,7 @@ void to_json(nlohmann::json& j, const ApiResponse& o)
         j["type"] = o.m_Type;
     if(o.messageIsSet())
         j["message"] = o.m_Message;
+    
 }
 
 void from_json(const nlohmann::json& j, ApiResponse& o)
@@ -66,6 +67,7 @@ void from_json(const nlohmann::json& j, ApiResponse& o)
         j.at("message").get_to(o.m_Message);
         o.m_MessageIsSet = true;
     } 
+    
 }
 
 int32_t ApiResponse::getCode() const
@@ -120,6 +122,7 @@ void ApiResponse::unsetMessage()
     m_MessageIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/cpp-pistache/model/Category.cpp b/samples/server/petstore/cpp-pistache/model/Category.cpp
index 43ff1d490004..3b08114f61de 100644
--- a/samples/server/petstore/cpp-pistache/model/Category.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Category.cpp
@@ -43,6 +43,7 @@ void to_json(nlohmann::json& j, const Category& o)
         j["id"] = o.m_Id;
     if(o.nameIsSet())
         j["name"] = o.m_Name;
+    
 }
 
 void from_json(const nlohmann::json& j, Category& o)
@@ -57,6 +58,7 @@ void from_json(const nlohmann::json& j, Category& o)
         j.at("name").get_to(o.m_Name);
         o.m_NameIsSet = true;
     } 
+    
 }
 
 int64_t Category::getId() const
@@ -94,6 +96,7 @@ void Category::unsetName()
     m_NameIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/cpp-pistache/model/Order.cpp b/samples/server/petstore/cpp-pistache/model/Order.cpp
index 82efbce6cb22..986cf6b24fa9 100644
--- a/samples/server/petstore/cpp-pistache/model/Order.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Order.cpp
@@ -59,6 +59,7 @@ void to_json(nlohmann::json& j, const Order& o)
         j["status"] = o.m_Status;
     if(o.completeIsSet())
         j["complete"] = o.m_Complete;
+    
 }
 
 void from_json(const nlohmann::json& j, Order& o)
@@ -93,6 +94,7 @@ void from_json(const nlohmann::json& j, Order& o)
         j.at("complete").get_to(o.m_Complete);
         o.m_CompleteIsSet = true;
     } 
+    
 }
 
 int64_t Order::getId() const
@@ -198,6 +200,7 @@ void Order::unsetComplete()
     m_CompleteIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/cpp-pistache/model/Pet.cpp b/samples/server/petstore/cpp-pistache/model/Pet.cpp
index 0ff016b545f0..434b1339cd06 100644
--- a/samples/server/petstore/cpp-pistache/model/Pet.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Pet.cpp
@@ -52,6 +52,7 @@ void to_json(nlohmann::json& j, const Pet& o)
         j["tags"] = o.m_Tags;
     if(o.statusIsSet())
         j["status"] = o.m_Status;
+    
 }
 
 void from_json(const nlohmann::json& j, Pet& o)
@@ -78,6 +79,7 @@ void from_json(const nlohmann::json& j, Pet& o)
         j.at("status").get_to(o.m_Status);
         o.m_StatusIsSet = true;
     } 
+    
 }
 
 int64_t Pet::getId() const
@@ -165,6 +167,7 @@ void Pet::unsetStatus()
     m_StatusIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/cpp-pistache/model/Tag.cpp b/samples/server/petstore/cpp-pistache/model/Tag.cpp
index 7f56fb2bcca9..cba759bad1d0 100644
--- a/samples/server/petstore/cpp-pistache/model/Tag.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Tag.cpp
@@ -43,6 +43,7 @@ void to_json(nlohmann::json& j, const Tag& o)
         j["id"] = o.m_Id;
     if(o.nameIsSet())
         j["name"] = o.m_Name;
+    
 }
 
 void from_json(const nlohmann::json& j, Tag& o)
@@ -57,6 +58,7 @@ void from_json(const nlohmann::json& j, Tag& o)
         j.at("name").get_to(o.m_Name);
         o.m_NameIsSet = true;
     } 
+    
 }
 
 int64_t Tag::getId() const
@@ -94,6 +96,7 @@ void Tag::unsetName()
     m_NameIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/cpp-pistache/model/User.cpp b/samples/server/petstore/cpp-pistache/model/User.cpp
index 20ae06352f25..2db9316b75d9 100644
--- a/samples/server/petstore/cpp-pistache/model/User.cpp
+++ b/samples/server/petstore/cpp-pistache/model/User.cpp
@@ -67,6 +67,7 @@ void to_json(nlohmann::json& j, const User& o)
         j["phone"] = o.m_Phone;
     if(o.userStatusIsSet())
         j["userStatus"] = o.m_UserStatus;
+    
 }
 
 void from_json(const nlohmann::json& j, User& o)
@@ -111,6 +112,7 @@ void from_json(const nlohmann::json& j, User& o)
         j.at("userStatus").get_to(o.m_UserStatus);
         o.m_UserStatusIsSet = true;
     } 
+    
 }
 
 int64_t User::getId() const
@@ -250,6 +252,7 @@ void User::unsetUserStatus()
     m_UserStatusIsSet = false;
 }
 
+
 }
 }
 }
diff --git a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
index 5733e1ee0b0a..c8a8a1bf671f 100644
--- a/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
+++ b/samples/server/petstore/java-undertow/src/main/java/org/openapitools/handler/PathHandlerInterface.java
@@ -541,10 +541,10 @@ public interface PathHandlerInterface {
      * <p><b>Response headers</b>: [CodegenProperty{openApiType='integer', baseName='X-Rate-Limit', complexType='null', getter='getxRateLimit', setter='setxRateLimit', description='calls per hour allowed by the user', dataType='Integer', datatypeWithEnum='Integer', dataFormat='int32', name='xRateLimit', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Rate-Limit;', baseType='Integer', containerType='null', title='null', unescapedDescription='calls per hour allowed by the user', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{
   "type" : "integer",
   "format" : "int32"
-}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{
+}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=true, isModel=false, isContainer=false, isString=false, isNumeric=true, isInteger=true, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=false, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XRateLimit', nameInSnakeCase='X_RATE_LIMIT', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false}, CodegenProperty{openApiType='string', baseName='X-Expires-After', complexType='Date', getter='getxExpiresAfter', setter='setxExpiresAfter', description='date in UTC when toekn expires', dataType='Date', datatypeWithEnum='Date', dataFormat='date-time', name='xExpiresAfter', min='null', max='null', defaultValue='null', defaultValueWithParam=' = data.X-Expires-After;', baseType='Date', containerType='null', title='null', unescapedDescription='date in UTC when toekn expires', maxLength=null, minLength=null, pattern='null', example='null', jsonSchema='{
   "type" : "string",
   "format" : "date-time"
-}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false}]</p>
+}', minimum='null', maximum='null', exclusiveMinimum=false, exclusiveMaximum=false, required=false, deprecated=false, hasMoreNonReadOnly=false, isPrimitiveType=false, isModel=false, isContainer=false, isString=false, isNumeric=false, isInteger=false, isLong=false, isNumber=false, isFloat=false, isDouble=false, isDecimal=false, isByteArray=false, isBinary=false, isFile=false, isBoolean=false, isDate=false, isDateTime=true, isUuid=false, isUri=false, isEmail=false, isFreeFormObject=false, isArray=false, isMap=false, isEnum=false, isReadOnly=false, isWriteOnly=false, isNullable=false, isSelfReference=false, isCircularReference=false, isDiscriminator=false, _enum=null, allowableValues=null, items=null, additionalProperties=null, vars=[], requiredVars=[], mostInnerItems=null, vendorExtensions={}, hasValidation=false, isInherited=false, discriminatorValue='null', nameInCamelCase='XExpiresAfter', nameInSnakeCase='X_EXPIRES_AFTER', enumName='null', maxItems=null, minItems=null, maxProperties=null, minProperties=null, uniqueItems=false, multipleOf=null, isXmlAttribute=false, xmlPrefix='null', xmlName='null', xmlNamespace='null', isXmlWrapped=false, isNull=false, getAdditionalPropertiesIsAnyType=false, getHasVars=false}]</p>
      *
      * <p><b>Produces</b>: [{mediaType=application/xml}, {mediaType=application/json}]</p>
      * <p><b>Returns</b>: {@link String}</p>
diff --git a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
index 11b5626ad017..ef2d8a6d268c 100644
--- a/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
+++ b/samples/server/petstore/jaxrs-cxf-cdi/pom.xml
@@ -67,7 +67,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>[2.8.3,3)</version>
+            <version>[2.8.3,2.12.1]</version>
         </dependency>
 
         <!-- Swagger annotations -->
diff --git a/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES b/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
index 980f24f90676..46fbadf7e596 100644
--- a/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
+++ b/samples/server/petstore/jaxrs-jersey/.openapi-generator/FILES
@@ -57,6 +57,7 @@ src/gen/java/org/openapitools/model/OuterEnum.java
 src/gen/java/org/openapitools/model/OuterEnumDefaultValue.java
 src/gen/java/org/openapitools/model/OuterEnumInteger.java
 src/gen/java/org/openapitools/model/OuterEnumIntegerDefaultValue.java
+src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java
 src/gen/java/org/openapitools/model/Pet.java
 src/gen/java/org/openapitools/model/ReadOnlyFirst.java
 src/gen/java/org/openapitools/model/SpecialModelName.java
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
index 3ce42cd81fb5..08171d2547d5 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
@@ -16,6 +16,7 @@ import org.openapitools.model.HealthCheckResult;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.OuterObjectWithEnumProperty;
 import org.openapitools.model.Pet;
 import org.openapitools.model.User;
 
@@ -139,6 +140,18 @@ public class FakeApi  {
     throws NotFoundException {
         return delegate.fakeOuterStringSerialize(body, securityContext);
     }
+    @POST
+    @Path("/property/enum-int")
+    @Consumes({ "application/json" })
+    @Produces({ "*/*" })
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Test serialization of enum (int) properties with examples", response = OuterObjectWithEnumProperty.class, tags={ "fake", })
+    @io.swagger.annotations.ApiResponses(value = {
+        @io.swagger.annotations.ApiResponse(code = 200, message = "Output enum (int)", response = OuterObjectWithEnumProperty.class)
+    })
+    public Response fakePropertyEnumIntegerSerialize(@ApiParam(value = "Input enum (int) as post body", required = true) @NotNull @Valid  OuterObjectWithEnumProperty outerObjectWithEnumProperty,@Context SecurityContext securityContext)
+    throws NotFoundException {
+        return delegate.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty, securityContext);
+    }
     @PUT
     @Path("/body-with-file-schema")
     @Consumes({ "application/json" })
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
index 63068f1fcba0..60685a8f5ff4 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -14,6 +14,7 @@ import org.openapitools.model.HealthCheckResult;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.OuterObjectWithEnumProperty;
 import org.openapitools.model.Pet;
 import org.openapitools.model.User;
 
@@ -33,6 +34,7 @@ public abstract class FakeApiService {
     public abstract Response fakeOuterCompositeSerialize(OuterComposite outerComposite,SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeOuterNumberSerialize(BigDecimal body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response fakeOuterStringSerialize(String body,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java
new file mode 100644
index 000000000000..55890a0c6ee1
--- /dev/null
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterObjectWithEnumProperty.java
@@ -0,0 +1,98 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * 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.
+ */
+
+
+package org.openapitools.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.model.OuterEnumInteger;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import javax.validation.constraints.*;
+import javax.validation.Valid;
+
+/**
+ * OuterObjectWithEnumProperty
+ */
+@JsonPropertyOrder({
+  OuterObjectWithEnumProperty.JSON_PROPERTY_VALUE
+})
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJerseyServerCodegen")
+public class OuterObjectWithEnumProperty   {
+  public static final String JSON_PROPERTY_VALUE = "value";
+  @JsonProperty(JSON_PROPERTY_VALUE)
+  private OuterEnumInteger value;
+
+  public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
+    this.value = value;
+    return this;
+  }
+
+  /**
+   * Get value
+   * @return value
+   **/
+  @JsonProperty("value")
+  @ApiModelProperty(required = true, value = "")
+  @NotNull @Valid 
+  public OuterEnumInteger getValue() {
+    return value;
+  }
+
+  public void setValue(OuterEnumInteger value) {
+    this.value = value;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OuterObjectWithEnumProperty outerObjectWithEnumProperty = (OuterObjectWithEnumProperty) o;
+    return Objects.equals(this.value, outerObjectWithEnumProperty.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterObjectWithEnumProperty {\n");
+    
+    sb.append("    value: ").append(toIndentedString(value)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 0a6baad8adeb..10c9235fe628 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -12,6 +12,7 @@ import org.openapitools.model.HealthCheckResult;
 import java.util.Map;
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.OuterObjectWithEnumProperty;
 import org.openapitools.model.Pet;
 import org.openapitools.model.User;
 
@@ -58,6 +59,11 @@ public class FakeApiServiceImpl extends FakeApiService {
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
+    public Response fakePropertyEnumIntegerSerialize(OuterObjectWithEnumProperty outerObjectWithEnumProperty, SecurityContext securityContext) throws NotFoundException {
+        // do some magic!
+        return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
+    }
+    @Override
     public Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES
index 603506bb9112..0d54ad9ead60 100644
--- a/samples/server/petstore/php-laravel/.openapi-generator/FILES
+++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES
@@ -60,6 +60,7 @@ lib/app/Models/OuterEnum.php
 lib/app/Models/OuterEnumDefaultValue.php
 lib/app/Models/OuterEnumInteger.php
 lib/app/Models/OuterEnumIntegerDefaultValue.php
+lib/app/Models/OuterObjectWithEnumProperty.php
 lib/app/Models/Pet.php
 lib/app/Models/ReadOnlyFirst.php
 lib/app/Models/SpecialModelName.php
diff --git a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
index 8029bd4ad98d..cb3da629aaa5 100644
--- a/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
+++ b/samples/server/petstore/php-laravel/lib/app/Http/Controllers/FakeController.php
@@ -465,6 +465,30 @@ class FakeController extends Controller
 
         return response('How about implementing fakeOuterStringSerialize as a post method ?');
     }
+    /**
+     * Operation fakePropertyEnumIntegerSerialize
+     *
+     * .
+     *
+     *
+     * @return Http response
+     */
+    public function fakePropertyEnumIntegerSerialize()
+    {
+        $input = Request::all();
+
+        //path params validation
+
+
+        //not path params validation
+        if (!isset($input['outerObjectWithEnumProperty'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $outerObjectWithEnumProperty when calling fakePropertyEnumIntegerSerialize');
+        }
+        $outerObjectWithEnumProperty = $input['outerObjectWithEnumProperty'];
+
+
+        return response('How about implementing fakePropertyEnumIntegerSerialize as a post method ?');
+    }
     /**
      * Operation testQueryParameterCollectionFormat
      *
diff --git a/samples/server/petstore/php-laravel/lib/app/Models/OuterObjectWithEnumProperty.php b/samples/server/petstore/php-laravel/lib/app/Models/OuterObjectWithEnumProperty.php
new file mode 100644
index 000000000000..b2bd8d779644
--- /dev/null
+++ b/samples/server/petstore/php-laravel/lib/app/Models/OuterObjectWithEnumProperty.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * OuterObjectWithEnumProperty
+ */
+namespace app\Models;
+
+/**
+ * OuterObjectWithEnumProperty
+ */
+class OuterObjectWithEnumProperty {
+
+    /** @var \app\Models\OuterEnumInteger $value */
+    private $value;
+
+}
diff --git a/samples/server/petstore/php-laravel/lib/routes/api.php b/samples/server/petstore/php-laravel/lib/routes/api.php
index a0ef076e3f9c..856cc66810a1 100644
--- a/samples/server/petstore/php-laravel/lib/routes/api.php
+++ b/samples/server/petstore/php-laravel/lib/routes/api.php
@@ -133,6 +133,13 @@ Route::post('/v2/fake/outer/number', 'FakeController@fakeOuterNumberSerialize');
  * Output-Formats: [*_/_*]
  */
 Route::post('/v2/fake/outer/string', 'FakeController@fakeOuterStringSerialize');
+/**
+ * post fakePropertyEnumIntegerSerialize
+ * Summary: 
+ * Notes: Test serialization of enum (int) properties with examples
+ * Output-Formats: [*_/_*]
+ */
+Route::post('/v2/fake/property/enum-int', 'FakeController@fakePropertyEnumIntegerSerialize');
 /**
  * put testQueryParameterCollectionFormat
  * Summary: 
diff --git a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
index 53495aa6d10e..86e5ae7356fe 100644
--- a/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
+++ b/samples/server/petstore/php-lumen/lib/app/Http/Controllers/FakeApi.php
@@ -461,6 +461,30 @@ class FakeApi extends Controller
 
         return response('How about implementing fakeOuterStringSerialize as a post method ?');
     }
+    /**
+     * Operation fakePropertyEnumIntegerSerialize
+     *
+     * .
+     *
+     *
+     * @return Http response
+     */
+    public function fakePropertyEnumIntegerSerialize()
+    {
+        $input = Request::all();
+
+        //path params validation
+
+
+        //not path params validation
+        if (!isset($input['outer_object_with_enum_property'])) {
+            throw new \InvalidArgumentException('Missing the required parameter $outer_object_with_enum_property when calling fakePropertyEnumIntegerSerialize');
+        }
+        $outer_object_with_enum_property = $input['outer_object_with_enum_property'];
+
+
+        return response('How about implementing fakePropertyEnumIntegerSerialize as a post method ?');
+    }
     /**
      * Operation testQueryParameterCollectionFormat
      *
diff --git a/samples/server/petstore/php-lumen/lib/routes/web.php b/samples/server/petstore/php-lumen/lib/routes/web.php
index 5f08105d2f29..f159b8da780b 100644
--- a/samples/server/petstore/php-lumen/lib/routes/web.php
+++ b/samples/server/petstore/php-lumen/lib/routes/web.php
@@ -149,6 +149,13 @@ $router->post('/v2/fake/outer/number', 'FakeApi@fakeOuterNumberSerialize');
  */
 $router->post('/v2/fake/outer/string', 'FakeApi@fakeOuterStringSerialize');
 
+/**
+ * post fakePropertyEnumIntegerSerialize
+ * Summary: 
+ * Notes: Test serialization of enum (int) properties with examples
+ */
+$router->post('/v2/fake/property/enum-int', 'FakeApi@fakePropertyEnumIntegerSerialize');
+
 /**
  * put testQueryParameterCollectionFormat
  * Summary: 
diff --git a/samples/server/petstore/springboot-virtualan/README.md b/samples/server/petstore/springboot-virtualan/README.md
index 34d7562140a4..ad53827c8b83 100644
--- a/samples/server/petstore/springboot-virtualan/README.md
+++ b/samples/server/petstore/springboot-virtualan/README.md
@@ -20,7 +20,7 @@ Change default port value in application.properties
 ## Virtualan :
 
 You can view Virtualan UI by pointing to  
-http://localhost:80//virtualan-ui.html.
+http://localhost:8080//virtualan-ui.html
 
 How to use guide available in the Virtualan wiki  
-https://github.com/elan-venture/virtualan/wiki
+https://github.com/virtualansoftware/virtualan/wiki
diff --git a/samples/server/petstore/springboot-virtualan/pom.xml b/samples/server/petstore/springboot-virtualan/pom.xml
index 35884bad18b5..3dceb8a963e7 100644
--- a/samples/server/petstore/springboot-virtualan/pom.xml
+++ b/samples/server/petstore/springboot-virtualan/pom.xml
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>io.virtualan</groupId>
             <artifactId>virtualan-plugin</artifactId>
-            <version>1.0.0</version>
+            <version>2.1.7</version>
         </dependency>
         <!-- HyperSQL DB -->
         <dependency>
diff --git a/website/src/dynamic/users.yml b/website/src/dynamic/users.yml
index bc0241a3ebf4..cbd789930a70 100644
--- a/website/src/dynamic/users.yml
+++ b/website/src/dynamic/users.yml
@@ -298,11 +298,6 @@
   image: "img/companies/nokia.png"
   infoLink: "https://www.nokia.com/"
   pinned: false
--
-  caption: "PLAID, Inc."
-  image: "img/companies/plaidcojp.jpg"
-  infoLink: "https://plaid.co.jp/"
-  pinned: false
 -
   caption: Options Clearing Corporation (OCC)
   image: "img/companies/occ.jpg"
@@ -328,6 +323,16 @@
   image: "img/companies/paxos.png"
   infoLink: "https://www.paxos.com/"
   pinned: false
+-
+  caption: "PLAID, Inc."
+  image: "img/companies/plaidcojp.jpg"
+  infoLink: "https://plaid.co.jp/"
+  pinned: false
+-
+  caption: Plaid
+  image: "img/companies/plaid.png"
+  infoLink: "https://www.plaid.com/"
+  pinned: false
 -
   caption: Ponicode
   image: "img/companies/ponicode.png"
@@ -373,6 +378,11 @@
   image: "img/companies/rest-united.png"
   infoLink: "https://restunited.com/"
   pinned: false
+-
+  caption: "Shotstack"
+  image: "img/companies/shotstack.svg"
+  infoLink: "https://shotstack.io"
+  pinned: false
 -
   caption: "SmartHR"
   image: "img/companies/smarthr.png"
diff --git a/website/static/img/companies/plaid.png b/website/static/img/companies/plaid.png
new file mode 100644
index 000000000000..4665f4d07cc0
Binary files /dev/null and b/website/static/img/companies/plaid.png differ
diff --git a/website/static/img/companies/shotstack.svg b/website/static/img/companies/shotstack.svg
new file mode 100755
index 000000000000..7f8ff9082168
--- /dev/null
+++ b/website/static/img/companies/shotstack.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 542.22 137.86"  xmlns:v="https://vecta.io/nano"><path d="M57.67 131.86L6.06 100.15l25.71-15.63M83.8 53.28l25.73 46.98-51.88 31.53L6 37.47M58.03 6L6.16 37.53l51.61 31.71 51.88-31.53L58.03 6z" fill="none" stroke="#25d3d0" stroke-width="12" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10"/><g fill="#2d2d2d"><path d="M150.72 98.35c-3.43 0-6.7-.33-9.81-.97-3.11-.65-5.67-1.56-7.68-2.75l2.85-14.89c2.22 1.3 4.74 2.36 7.56 3.19s5.47 1.24 7.95 1.24c2.11 0 3.79-.24 5.03-.71s1.97-1.36 2.18-2.66c.26-1.48-.4-2.55-1.98-3.23l-6.96-2.88c-3.43-1.42-6.04-3.17-7.84-5.27-1.79-2.1-2.69-4.8-2.69-8.11 0-1.36.16-2.78.48-4.25 1.16-6.14 3.76-10.6 7.8-13.38s9.83-4.16 17.37-4.16c1.79 0 3.68.13 5.66.4s3.86.59 5.66.98c1.79.38 3.3.81 4.51 1.28l-2.85 14.98c-2.43-1.18-4.72-2.02-6.89-2.53-2.16-.5-4.17-.75-6.02-.75-1.32 0-2.59.07-3.8.22s-2.2.47-2.97.97-1.15 1.28-1.15 2.35c0 .95.62 1.67 1.86 2.17s3.21 1.2 5.9 2.08c4.48 1.48 7.58 3.46 9.3 5.94 1.71 2.48 2.57 5.29 2.57 8.42a23.88 23.88 0 0 1-.48 4.7c-1 5.32-3.58 9.59-7.72 12.8-4.13 3.21-10.08 4.82-17.84 4.82zm23.07-.89l10.76-57.07h17.02l-3.72 19.94h15.12l3.72-19.94h17.02l-10.76 57.07h-17.02l3.72-19.94h-15.12l-3.72 19.94h-17.02zm75.77.89c-4.38 0-8.22-.72-11.52-2.17s-5.86-3.69-7.68-6.73-2.73-6.96-2.73-11.74c0-1.36.07-2.75.2-4.16.13-1.42.36-2.92.67-4.52 1.37-7.15 3.42-12.88 6.13-17.19 2.72-4.31 6.23-7.44 10.53-9.39s9.51-2.92 15.63-2.92c6.75 0 12.1 1.68 16.03 5.05s5.9 8.63 5.9 15.77c0 1.3-.07 2.67-.2 4.12s-.36 2.97-.67 4.56c-1.32 7.03-3.34 12.7-6.06 17.01s-6.23 7.44-10.53 9.39c-4.29 1.95-9.52 2.92-15.7 2.92zm3.09-16.13c3.27 0 5.83-1.03 7.68-3.1s3.22-5.43 4.12-10.1c.47-2.48.71-4.55.71-6.2 0-2.6-.58-4.43-1.74-5.49s-3.06-1.59-5.7-1.59c-3.32 0-5.91.99-7.76 2.97s-3.22 5.42-4.12 10.32c-.48 2.36-.71 4.37-.71 6.03 0 2.54.59 4.37 1.78 5.49 1.19 1.11 3.1 1.67 5.74 1.67z"/><path d="M285.61,97.46l8.15-43.15h-13.61l2.61-13.91h44.32l-2.61,13.91h-13.69l-8.15,43.15H285.61z"/><path d="M331.73 98.35c-3.43 0-6.7-.33-9.81-.97s-5.67-1.56-7.68-2.75l2.85-14.89c2.22 1.3 4.74 2.36 7.56 3.19s5.47 1.24 7.96 1.24c2.11 0 3.79-.24 5.03-.71s1.97-1.36 2.18-2.66c.26-1.48-.4-2.55-1.98-3.23l-6.96-2.88c-3.43-1.42-6.04-3.17-7.84-5.27-1.79-2.1-2.69-4.8-2.69-8.11 0-1.36.16-2.78.48-4.25 1.16-6.14 3.76-10.6 7.8-13.38s9.83-4.16 17.37-4.16c1.79 0 3.68.13 5.66.4s3.86.59 5.66.98c1.79.38 3.3.81 4.51 1.28l-2.85 14.98c-2.43-1.18-4.72-2.02-6.89-2.53-2.17-.5-4.17-.75-6.02-.75-1.32 0-2.59.07-3.8.22s-2.2.47-2.97.97-1.15 1.28-1.15 2.35c0 .95.62 1.67 1.86 2.17s3.21 1.2 5.9 2.08c4.48 1.48 7.58 3.46 9.3 5.94 1.71 2.48 2.57 5.29 2.57 8.42 0 1.54-.16 3.1-.47 4.7-1 5.32-3.58 9.59-7.72 12.8-4.16 3.21-10.11 4.82-17.86 4.82z"/><path d="M363.18 97.46l8.15-43.15h-13.61l2.61-13.91h44.32l-2.61 13.91h-13.69l-8.15 43.15h-17.02zm20.75 0l30.31-57.07h17.81l8.87 57.07H423.9l-1.82-11.34h-13.85l-6.02 11.34h-18.28zm28.89-24.63h9.58l-2.22-13.82-7.36 13.82zm51.58 25.52c-4.91 0-9.2-.84-12.86-2.53-3.67-1.68-6.53-4.17-8.59-7.44s-3.09-7.31-3.09-12.1c0-2.24.24-4.64.71-7.18 1.85-9.69 5.51-17.04 11-22.06s13.46-7.53 23.9-7.53c3.11 0 5.9.27 8.35.8s4.74 1.3 6.85 2.3l-3.17 16.57c-2.11-1.24-4.21-2.14-6.29-2.7s-4.63-.84-7.64-.84c-4.27 0-7.73 1.02-10.37 3.06s-4.41 5.51-5.3 10.41c-.16.95-.29 1.83-.4 2.66s-.16 1.59-.16 2.3c0 3.01.88 5.13 2.65 6.34s4.66 1.82 8.67 1.82a35 35 0 0 0 7.64-.84c2.5-.56 5.05-1.43 7.64-2.61l-3.17 16.66c-2.48.95-5.03 1.67-7.64 2.17-2.59.49-5.51.74-8.73.74zm17.51-.89l10.76-57.07h17.02l-3.4 18.08 16.7-18.08h19.23l-22.08 23.57 12.74 33.5h-18.05l-7.44-21.44-5.54 5.76-2.93 15.68h-17.01z"/></g></svg>
\ No newline at end of file