From 58ed6afc0dc51a341cad01420274752b6ec31bff Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Mon, 1 Jun 2020 21:08:50 -0400
Subject: [PATCH 01/22] Update Generate.java (#6515)

Removed missed -D messages
---
 .../src/main/java/org/openapitools/codegen/cmd/Generate.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
index b7f989eeaac..3387a404748 100644
--- a/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
+++ b/modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/Generate.java
@@ -230,7 +230,7 @@ public class Generate extends OpenApiGeneratorCommand {
     @Option(name = {"--log-to-stderr"},
             title = "Log to STDERR",
             description = "write all log messages (not just errors) to STDOUT."
-                    + " Useful for piping the JSON output of debug options (e.g. `-DdebugOperations`) to an external parser directly while testing a generator.")
+                    + " Useful for piping the JSON output of debug options (e.g. `--global-property debugOperations`) to an external parser directly while testing a generator.")
     private Boolean logToStderr;
 
     @Option(name = {"--enable-post-process-file"}, title = "enable post-process file", description = CodegenConstants.ENABLE_POST_PROCESS_FILE_DESC)
@@ -407,7 +407,6 @@ public class Generate extends OpenApiGeneratorCommand {
         }
 
         if (globalProperties != null && !globalProperties.isEmpty()) {
-            System.err.println("[DEPRECATED] -D arguments after 'generate' are application arguments and not Java System Properties, please consider changing to --global-property, apply your system properties to JAVA_OPTS, or move the -D arguments before the jar option.");
             applyGlobalPropertiesKvpList(globalProperties, configurator);
         }
         applyInstantiationTypesKvpList(instantiationTypes, configurator);

From 4c3eb0d97368023fe71c0f5293fc6d0d0c9c19c8 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 2 Jun 2020 10:54:57 +0800
Subject: [PATCH 02/22] [Go][Experimental] Add discriminator support to anyOf
 (#6511)

* add discriminator support in anyof

* update samples
---
 .../go-experimental/model_anyof.mustache      | 31 ++++++++++++++++++-
 .../go-petstore/model_gm_fruit.go             |  1 +
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache
index 86cda3bc747..dcf8c9f8df1 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache
@@ -15,6 +15,35 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	}
 
 	{{/isNullable}}
+	{{#discriminator}}
+	{{#mappedModels}}
+    {{#-first}}
+	// use discriminator value to speed up the lookup
+	var jsonDict map[string]interface{}
+	err := json.Unmarshal(data, &jsonDict)
+	if err != nil {
+		return fmt.Errorf("Failed to unmarshal JSON into map for the discrimintor lookup.")
+	}
+
+    {{/-first}}
+	// check if the discriminator value is '{{{mappingName}}}'
+	if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
+		// try to unmarshal JSON data into {{{modelName}}}
+		err = json.Unmarshal(data, &dst.{{{modelName}}});
+		if err == nil {
+			json{{{modelName}}}, _ := json.Marshal(dst.{{{modelName}}})
+			if string(json{{{modelName}}}) == "{}" { // empty struct
+				dst.{{{modelName}}} = nil
+			} else {
+				return nil // data stored in dst.{{{modelName}}}, return on the first match
+			}
+		} else {
+			dst.{{{modelName}}} = nil
+		}
+	}
+
+	{{/mappedModels}}
+	{{/discriminator}}
 	{{#anyOf}}
 	// try to unmarshal JSON data into {{{.}}}
 	err = json.Unmarshal(data, &dst.{{{.}}});
@@ -44,4 +73,4 @@ func (src *{{classname}}) MarshalJSON() ([]byte, error) {
 	return nil, nil // no data in anyOf schemas
 }
 
-{{>nullable_model}}
\ No newline at end of file
+{{>nullable_model}}
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_gm_fruit.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_gm_fruit.go
index 03baf438d13..6f2960cc319 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_gm_fruit.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_gm_fruit.go
@@ -101,3 +101,4 @@ func (v *NullableGmFruit) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+

From 0fbbbe8a9505da9ef4c7a8a727e116082fb3942e Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 2 Jun 2020 10:55:56 +0800
Subject: [PATCH 03/22] add discriminator support to anyOf powershell client
 (#6512)

---
 .../resources/powershell/model_anyof.mustache | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache b/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
index f58773df049..a3310c354b3 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
@@ -38,6 +38,35 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
         }
 
         {{/isNullable}}
+        {{#discriminator}}
+        {{#mappedModels}}
+        {{#-first}}
+        $JsonData = ConvertFrom-Json -InputObject $Json
+        {{/-first}}
+        # check if the discriminator value is '{{{mappingName}}}'
+        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value == "{{{mappingName}}}") {
+            # try to match {{{modelName}}} defined in the anyOf schemas
+            try {
+                $matchInstance = ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{modelName}}} $Json
+
+                foreach($property in $matchInstance.PsObject.Properties) {
+                    if ($null -ne $property.Value) {
+                        $matchType = "{{{modelName}}}"
+                        return [PSCustomObject]@{
+                            "ActualType" = ${matchType}
+                            "ActualInstance" = ${matchInstance}
+                            "anyOfSchemas" = @({{#anyOf}}"{{{.}}}"{{^-last}}, {{/-last}}{{/anyOf}})
+                        }
+                    }
+                }
+            } catch {
+                # fail to match the schema defined in anyOf with the discriminator lookup, proceed to the next one
+                Write-Debug "Failed to match '{{{modelName}}}' defined in anyOf ({{{apiNamePrefix}}}{{{classname}}}) using the discriminator lookup ({{{mappingName}}}). Proceeding with the typical anyOf type matching."
+            }
+        }
+    
+        {{/mappedModels}}
+        {{/discriminator}}
         {{#anyOf}}
         if ($match -ne 0) { # no match yet
             # try to match {{{.}}} defined in the anyOf schemas

From c1cf63e81cb21fab20994c683c0fb627484fee56 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 2 Jun 2020 14:07:05 +0800
Subject: [PATCH 04/22] [PowerShell] Add useOneOfDiscriminatorLookup option
 (#6516)

* add useOneOfDiscriminatorLookup option

* update doc
---
 docs/generators/powershell.md                 |   1 +
 .../codegen/CodegenConstants.java             |   2 +
 .../languages/PowerShellClientCodegen.java    |  17 +-
 .../resources/powershell/model_oneof.mustache |  31 ++
 .../src/PSPetstore/Client/PSConfiguration.ps1 | 137 ++++++
 .../Private/PSHttpSignatureAuth.ps1           | 453 ++++++++++++++----
 .../Private/PSRSAEncryptionProvider.cs        | 286 ++++-------
 7 files changed, 631 insertions(+), 296 deletions(-)

diff --git a/docs/generators/powershell.md b/docs/generators/powershell.md
index 2ce5aad8675..2b16a319698 100644
--- a/docs/generators/powershell.md
+++ b/docs/generators/powershell.md
@@ -11,6 +11,7 @@ sidebar_label: powershell
 |packageName|Client package name (e.g. PSTwitter).| |PSOpenAPITools|
 |packageVersion|Package version (e.g. 0.1.2).| |0.1.2|
 |powershellGalleryUrl|URL to the module in PowerShell Gallery (e.g. https://www.powershellgallery.com/packages/PSTwitter/).| |null|
+|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and onlye one match in oneOf's schemas) will be skipped.| |null|
 
 ## IMPORT MAPPING
 
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 fded4a05766..0fcb5199840 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
@@ -375,4 +375,6 @@ public class CodegenConstants {
         " 2) Boolean values of the 'additionalProperties' keyword are ignored. It's as if additional properties are NOT allowed." +
         "Note: the root cause are issues #1369 and #1371, which must be resolved in the swagger-parser project.";
 
+    public static final String USE_ONEOF_DISCRIMINATOR_LOOKUP = "useOneOfDiscriminatorLookup";
+    public static final String USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC = "Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and onlye one match in oneOf's schemas) will be skipped.";
 }
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 e81406fcbbf..bcdf58f57fc 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
@@ -53,6 +53,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
     protected HashSet powershellVerbs;
     protected Map<String, String> commonVerbs; // verbs not in the official ps verb list but can be mapped to one of the verbs
     protected HashSet methodNames; // store a list of method names to detect duplicates
+    protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup
 
     /**
      * Constructs an instance of `PowerShellClientCodegen`.
@@ -498,7 +499,7 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         cliOptions.add(new CliOption(CodegenConstants.OPTIONAL_PROJECT_GUID, "GUID for PowerShell module (e.g. a27b908d-2a20-467f-bc32-af6f3a654ac5). A random GUID will be generated by default."));
         cliOptions.add(new CliOption(CodegenConstants.API_NAME_PREFIX, "Prefix that will be appended to all PS objects. Default: empty string. e.g. Pet => PSPet."));
         cliOptions.add(new CliOption("commonVerbs", "PS common verb mappings. e.g. Delete=Remove:Patch=Update to map Delete with Remove and Patch with Update accordingly."));
-
+        cliOptions.add(new CliOption(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC));
     }
 
     public CodegenType getTag() {
@@ -535,6 +536,14 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
         this.powershellGalleryUrl = powershellGalleryUrl;
     }
 
+    public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) {
+        this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup;
+    }
+
+    public boolean getUseOneOfDiscriminatorLookup() {
+        return this.useOneOfDiscriminatorLookup;
+    }
+
     @Override
     public void processOpts() {
         super.processOpts();
@@ -550,6 +559,12 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
             additionalProperties.put("powershellGalleryUrl", powershellGalleryUrl);
         }
 
+        if (additionalProperties.containsKey(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP)) {
+            setUseOneOfDiscriminatorLookup(convertPropertyToBooleanAndWriteBack(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP));
+        } else {
+            additionalProperties.put(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, useOneOfDiscriminatorLookup);
+        }
+
         if (StringUtils.isNotBlank(powershellGalleryUrl)) {
             // get the last segment of the URL
             // e.g. https://www.powershellgallery.com/packages/PSTwitter => PSTwitter
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
index 5ff351bc4a8..4bda9700eab 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
@@ -38,6 +38,37 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
         }
 
         {{/isNullable}}
+        {{#useOneOfDiscriminatorLookup}}
+        {{#discriminator}}
+        {{#mappedModels}}
+        {{#-first}}
+        $JsonData = ConvertFrom-Json -InputObject $Json
+        {{/-first}}
+        # check if the discriminator value is '{{{mappingName}}}'
+        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value == "{{{mappingName}}}") {
+            # try to match {{{modelName}}} defined in the oneOf schemas
+            try {
+                $matchInstance = ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{modelName}}} $Json
+
+                foreach($property in $matchInstance.PsObject.Properties) {
+                    if ($null -ne $property.Value) {
+                        $matchType = "{{{modelName}}}"
+                        return [PSCustomObject]@{
+                            "ActualType" = ${matchType}
+                            "ActualInstance" = ${matchInstance}
+                            "oneOfSchemas" = @({{#oneOf}}"{{{.}}}"{{^-last}}, {{/-last}}{{/oneOf}})
+                        }
+                    }
+                }
+            } catch {
+                # fail to match the schema defined in oneOf with the discriminator lookup, proceed to the next one
+                Write-Debug "Failed to match '{{{modelName}}}' defined in oneOf ({{{apiNamePrefix}}}{{{classname}}}) using the discriminator lookup ({{{mappingName}}}). Proceeding with the typical oneOf type matching."
+            }
+        }
+    
+        {{/mappedModels}}
+        {{/discriminator}}
+        {{/useOneOfDiscriminatorLookup}}
         {{#oneOf}}
         # try to match {{{.}}} defined in the oneOf schemas
         try {
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Client/PSConfiguration.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Client/PSConfiguration.ps1
index ddb37a19c6e..8e6910f1970 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Client/PSConfiguration.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Client/PSConfiguration.ps1
@@ -388,3 +388,140 @@ function Get-PSUrlFromHostSetting {
 
     }
 }
+
+<#
+.SYNOPSIS
+Sets the configuration for http signing.
+.DESCRIPTION
+
+Sets the configuration for the HTTP signature security scheme.
+The HTTP signature security scheme is used to sign HTTP requests with a key
+which is in possession of the API client.
+An 'Authorization' header is calculated by creating a hash of select headers,
+and optionally the body of the HTTP request, then signing the hash value using
+a key. The 'Authorization' header is added to outbound HTTP requests.
+
+Ref: https://openapi-generator.tech
+
+.PARAMETER KeyId
+KeyId for HTTP signing 
+
+.PARAMETER KeyFilePath
+KeyFilePath for HTTP signing
+
+.PARAMETER KeyPassPhrase
+KeyPassPhrase, if the HTTP signing key is protected
+
+.PARAMETER HttpSigningHeader
+HttpSigningHeader list of HTTP headers used to calculate the signature. The two special signature headers '(request-target)' and '(created)' 
+SHOULD be included.
+    The '(created)' header expresses when the signature was created.
+    The '(request-target)' header is a concatenation of the lowercased :method, an
+    ASCII space, and the :path pseudo-headers.
+If no headers are specified then '(created)' sets as default.
+
+.PARAMETER HashAlgorithm
+HashAlgrithm to calculate the hash, Supported values are "sha256" and "sha512"
+
+.PARAMETER SigningAlgorithm
+SigningAlgorithm specifies the signature algorithm, supported values are "RSASSA-PKCS1-v1_5" and "RSASSA-PSS" 
+RSA key : Supported values "RSASSA-PKCS1-v1_5" and "RSASSA-PSS", for ECDSA key this parameter is not applicable
+
+.PARAMETER SignatureValidityPeriod
+SignatureValidityPeriod specifies the signature maximum validity time in seconds. It accepts integer value 
+
+.OUTPUTS
+
+System.Collections.Hashtable
+#>
+function Set-PSConfigurationHttpSigning {
+    [CmdletBinding()]
+    param(
+        [Parameter(Mandatory = $true)]
+        [ValidateNotNullOrEmpty()]
+        [string]$KeyId,
+        [Parameter(Mandatory = $true)]
+        [string]$KeyFilePath,
+        [Parameter(Mandatory = $false)]
+        [securestring]$KeyPassPhrase,
+        [Parameter(Mandatory = $false)]
+        [ValidateNotNullOrEmpty()]
+        [string[]] $HttpSigningHeader = @("(created)"),
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("sha256", "sha512")]
+        [string] $HashAlgorithm = "sha256",
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("RSASSA-PKCS1-v1_5", "RSASSA-PSS")]
+        [string]$SigningAlgorithm ,
+        [Parameter(Mandatory = $false)]
+        [int]$SignatureValidityPeriod
+    )
+
+    Process {
+        $httpSignatureConfiguration = @{ }
+
+        if (Test-Path -Path $KeyFilePath) {
+            $httpSignatureConfiguration["KeyId"] = $KeyId
+            $httpSignatureConfiguration["KeyFilePath"] = $KeyFilePath
+        }
+        else {
+            throw "Private key file path does not exist"
+        }
+
+        $keyType = Get-PSKeyTypeFromFile -KeyFilePath $KeyFilePath
+        if ([String]::IsNullOrEmpty($SigningAlgorithm)) {
+            if ($keyType -eq "RSA") {
+                $SigningAlgorithm = "RSASSA-PKCS1-v1_5"
+            }
+        }
+
+        if ($keyType -eq "RSA" -and 
+            ($SigningAlgorithm -ne "RSASSA-PKCS1-v1_5" -and $SigningAlgorithm -ne "RSASSA-PSS" )) {
+            throw "Provided Key and SigningAlgorithm : $SigningAlgorithm is not compatible."
+        }
+    
+        if ($HttpSigningHeader -contains "(expires)" -and $SignatureValidityPeriod -le 0) {
+            throw "SignatureValidityPeriod must be greater than 0 seconds."
+        }
+
+        if ($HttpSigningHeader -contains "(expires)") {
+            $httpSignatureConfiguration["SignatureValidityPeriod"] = $SignatureValidityPeriod
+        }
+        if ($null -ne $HttpSigningHeader -and $HttpSigningHeader.Length -gt 0) {
+            $httpSignatureConfiguration["HttpSigningHeader"] = $HttpSigningHeader
+        }
+
+        if ($null -ne $HashAlgorithm ) {
+            $httpSignatureConfiguration["HashAlgorithm"] = $HashAlgorithm
+        }
+
+        if ($null -ne $SigningAlgorithm) {
+            $httpSignatureConfiguration["SigningAlgorithm"] = $SigningAlgorithm
+        }
+
+        if ($null -ne $KeyPassPhrase) {
+            $httpSignatureConfiguration["KeyPassPhrase"] = $KeyPassPhrase
+        }
+    
+        $Script:Configuration["HttpSigning"] = New-Object -TypeName PSCustomObject -Property $httpSignatureConfiguration
+    }
+}
+
+<#
+.SYNOPSIS
+
+Get the configuration object 'PSConfigurationHttpSigning'.
+
+.DESCRIPTION
+
+Get the configuration object 'PSConfigurationHttpSigning'.
+
+.OUTPUTS
+
+[PSCustomObject]
+#>
+function Get-PSConfigurationHttpSigning{
+
+    $httpSignatureConfiguration = $Script:Configuration["HttpSigning"]
+    return $httpSignatureConfiguration
+}
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
index 1eabb0a2f54..d3fed6ead98 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Private/PSHttpSignatureAuth.ps1
@@ -7,64 +7,11 @@
 
 <#
 .SYNOPSIS
-Get the API key Id and API key file path.
-
+    Gets the headers for HTTP signature.
 .DESCRIPTION
-Get the API key Id and API key file path. If no api prefix is provided then it use default api key prefix 'Signature'
-.OUTPUTS
-PSCustomObject : This contains APIKeyId, APIKeyFilePath, APIKeyPrefix
-#>
-function Get-PSAPIKeyInfo {
-    $ApiKeysList = $Script:Configuration['ApiKey']
-    $ApiKeyPrefixList = $Script:Configuration['ApiKeyPrefix']
-    $apiPrefix = "Signature"
-
-    if ($null -eq $ApiKeysList -or $ApiKeysList.Count -eq 0) {
-        throw "Unable to reterieve the api key details"
-    }
-
-    if ($null -eq $ApiKeyPrefixList -or $ApiKeyPrefixList.Count -eq 0) {
-        Write-Verbose "Unable to reterieve the api key prefix details,setting it to default ""Signature"""
-    }
-
-    foreach ($item in $ApiKeysList.GetEnumerator()) {
-        if (![string]::IsNullOrEmpty($item.Name)) {
-            if (Test-Path -Path $item.Value) {
-                $apiKey = $item.Value
-                $apikeyId = $item.Name
-                break;
-            }
-            else {
-                throw "API key file path does not exist."
-            }
-        }
-    }
-
-    if ($ApiKeyPrefixList.ContainsKey($apikeyId)) {
-        $apiPrefix = ApiKeyPrefixList[$apikeyId]
-    }
-
-    if ($apikeyId -and $apiKey -and $apiPrefix) {
-        $result = New-Object -Type PSCustomObject -Property @{ 
-            ApiKeyId       = $apikeyId;
-            ApiKeyFilePath = $apiKey
-            ApiKeyPrefix   = $apiPrefix
-        }
-    }
-    else {
-        return $null
-    }
-    return $result
-}
-
-<#
-.SYNOPSIS
-    Gets the headers for http signed auth.
-
-.DESCRIPTION
-    Gets the headers for the http signed auth. It use (targetpath), date, host and body digest to create authorization header.
+    Gets the headers for the http sigature. 
 .PARAMETER Method
-    Http method
+    HTTP method
 .PARAMETER UriBuilder
     UriBuilder for url and query parameter
 .PARAMETER Body
@@ -76,93 +23,393 @@ function Get-PSHttpSignedHeader {
     param(
         [string]$Method,
         [System.UriBuilder]$UriBuilder,
-        [string]$Body
+        [string]$Body,
+        [hashtable]$RequestHeader
     )
 
+    $HEADER_REQUEST_TARGET = '(request-target)'
+    # The time when the HTTP signature was generated.
+    $HEADER_CREATED = '(created)'
+    # The time when the HTTP signature expires. The API server should reject HTTP requests
+    # that have expired.
+    $HEADER_EXPIRES = '(expires)'
+    # The 'Host' header.
+    $HEADER_HOST = 'Host'
+    # The 'Date' header.
+    $HEADER_DATE = 'Date'
+    # When the 'Digest' header is included in the HTTP signature, the client automatically
+    # computes the digest of the HTTP request body, per RFC 3230.
+    $HEADER_DIGEST = 'Digest'
+    # The 'Authorization' header is automatically generated by the client. It includes
+    # the list of signed headers and a base64-encoded signature.
+    $HEADER_AUTHORIZATION = 'Authorization'
+
     #Hash table to store singed headers
-    $HttpSignedHeader = @{}
+    $HttpSignedRequestHeader = @{ }
+    $HttpSignatureHeader = @{ }
     $TargetHost = $UriBuilder.Host
-
-    #Check for Authentication type
-    $apiKeyInfo = Get-PSAPIKeyInfo
-    if ($null -eq $apiKeyInfo) {
-        throw "Unable to reterieve the api key info "
-    }
-
+    $httpSigningConfiguration = Get-PSConfigurationHttpSigning
+    $Digest = $null
+    
     #get the body digest
-    $bodyHash = Get-PSStringHash -String $Body
-    $Digest = [String]::Format("SHA-256={0}", [Convert]::ToBase64String($bodyHash))
-
-    #get the date in UTC
+    $bodyHash = Get-PSStringHash -String $Body -HashName $httpSigningConfiguration.HashAlgorithm
+    if ($httpSigningConfiguration.HashAlgorithm -eq "SHA256") {
+        $Digest = [String]::Format("SHA-256={0}", [Convert]::ToBase64String($bodyHash))
+    }
+    elseif ($httpSigningConfiguration.HashAlgorithm -eq "SHA512") {
+        $Digest = [String]::Format("SHA-512={0}", [Convert]::ToBase64String($bodyHash))
+    }
+    
     $dateTime = Get-Date
+    #get the date in UTC
     $currentDate = $dateTime.ToUniversalTime().ToString("r")
 
-    $requestTargetPath = [string]::Format("{0} {1}{2}",$Method.ToLower(),$UriBuilder.Path.ToLower(),$UriBuilder.Query)
-    $h_requestTarget = [string]::Format("(request-target): {0}",$requestTargetPath)
-    $h_cdate = [string]::Format("date: {0}",$currentDate)
-    $h_digest = [string]::Format("digest: {0}",$Digest)
-    $h_targetHost = [string]::Format("host: {0}",$TargetHost)
+    foreach ($headerItem in $httpSigningConfiguration.HttpSigningHeader) {
+       
+        if ($headerItem -eq $HEADER_REQUEST_TARGET) { 
+            $requestTargetPath = [string]::Format("{0} {1}{2}", $Method.ToLower(), $UriBuilder.Path, $UriBuilder.Query)
+            $HttpSignatureHeader.Add($HEADER_REQUEST_TARGET, $requestTargetPath)
+        }
+        elseif ($headerItem -eq $HEADER_CREATED) {
+            $created = Get-PSUnixTime -Date $dateTime -TotalTime TotalSeconds
+            $HttpSignatureHeader.Add($HEADER_CREATED, $created)
+        }
+        elseif ($headerItem -eq $HEADER_EXPIRES) {
+            $expire = $dateTime.AddSeconds($httpSigningConfiguration.SignatureValidityPeriod)
+            $expireEpocTime = Get-PSUnixTime -Date $expire -TotalTime TotalSeconds
+            $HttpSignatureHeader.Add($HEADER_EXPIRES, $expireEpocTime)
+        }
+        elseif ($headerItem -eq $HEADER_HOST) {
+            $HttpSignedRequestHeader[$HEADER_HOST] = $TargetHost
+            $HttpSignatureHeader.Add($HEADER_HOST.ToLower(), $TargetHost)
+        }
+        elseif ($headerItem -eq $HEADER_DATE) {
+            $HttpSignedRequestHeader[$HEADER_DATE] = $currentDate
+            $HttpSignatureHeader.Add($HEADER_DATE.ToLower(), $currentDate)
+        }
+        elseif ($headerItem -eq $HEADER_DIGEST) {
+            $HttpSignedRequestHeader[$HEADER_DIGEST] = $Digest
+            $HttpSignatureHeader.Add($HEADER_DIGEST.ToLower(), $Digest)
+        }elseif($RequestHeader.ContainsKey($headerItem)){
+            $HttpSignatureHeader.Add($headerItem.ToLower(), $RequestHeader[$headerItem])
+        }else{
+            throw "Cannot sign HTTP request. Request does not contain the $headerItem header."
+        }
+    }
 
-    $stringToSign = [String]::Format("{0}`n{1}`n{2}`n{3}",
-                                    $h_requestTarget,$h_cdate,
-                                    $h_targetHost,$h_digest)
+    # header's name separated by space
+    $headersKeysString = $HttpSignatureHeader.Keys -join " "
+    $headerValuesList = @()
+    foreach ($item in $HttpSignatureHeader.GetEnumerator()) {
+        $headerValuesList += [string]::Format("{0}: {1}", $item.Name, $item.Value)
+    }
+    #Concatinate headers value separated by new line
+    $headerValuesString = $headerValuesList -join "`n"
     
-    $hashedString = Get-PSStringHash -String $stringToSign
-    $signedHeader = Get-PSRSASHA256SignedString -APIKeyFilePath $apiKeyInfo.ApiKeyFilePath -DataToSign $hashedString
-    $authorizationHeader = [string]::Format("{0} keyId=""{1}"",algorithm=""rsa-sha256"",headers=""(request-target) date host digest"",signature=""{2}""", 
-        $apiKeyInfo.ApiKeyPrefix, $apiKeyInfo.ApiKeyId, $signedHeader)
+    #Gets the hash of the headers value
+    $signatureHashString = Get-PSStringHash -String $headerValuesString -HashName $httpSigningConfiguration.HashAlgorithm
+
+    #Gets the Key type to select the correct signing alogorithm
+    $KeyType = Get-PSKeyTypeFromFile -KeyFilePath $httpSigningConfiguration.KeyFilePath
+
+    if ($keyType -eq "RSA") {
+        $headerSignatureStr = Get-PSRSASignature -PrivateKeyFilePath $httpSigningConfiguration.KeyFilePath `
+            -DataToSign $signatureHashString `
+            -HashAlgorithmName $httpSigningConfiguration.HashAlgorithm `
+            -KeyPassPhrase $httpSigningConfiguration.KeyPassPhrase `
+            -SigningAlgorithm $httpSigningConfiguration.SigningAlgorithm
+    }
+    elseif ($KeyType -eq "EC") {
+        $headerSignatureStr = Get-PSECDSASignature -ECKeyFilePath $httpSigningConfiguration.KeyFilePath `
+            -DataToSign $signatureHashString `
+            -HashAlgorithmName $httpSigningConfiguration.HashAlgorithm `
+            -KeyPassPhrase $httpSigningConfiguration.KeyPassPhrase
+    }
+    #Depricated
+    <#$cryptographicScheme = Get-PSCryptographicScheme -SigningAlgorithm $httpSigningConfiguration.SigningAlgorithm `
+                                                 -HashAlgorithm $httpSigningConfiguration.HashAlgorithm
+    #>
+    $cryptographicScheme = "hs2019"
+    $authorizationHeaderValue = [string]::Format("Signature keyId=""{0}"",algorithm=""{1}""",
+        $httpSigningConfiguration.KeyId, $cryptographicScheme)
+
+    if ($HttpSignatureHeader.ContainsKey($HEADER_CREATED)) {
+        $authorizationHeaderValue += [string]::Format(",created={0}", $HttpSignatureHeader[$HEADER_CREATED])
+    }
+
+    if ($HttpSignatureHeader.ContainsKey($HEADER_EXPIRES)) {
+        $authorizationHeaderValue += [string]::Format(",expires={0}", $HttpSignatureHeader[$HEADER_EXPIRES])
+    }
     
-    $HttpSignedHeader["Date"] = $currentDate
-    $HttpSignedHeader["Host"] = $TargetHost
-    $HttpSignedHeader["Content-Type"] = "application/json"
-    $HttpSignedHeader["Digest"] = $Digest
-    $HttpSignedHeader["Authorization"] = $authorizationHeader   
-    return $HttpSignedHeader
+    $authorizationHeaderValue += [string]::Format(",headers=""{0}"",signature=""{1}""", 
+        $headersKeysString , $headerSignatureStr)
+    
+    $HttpSignedRequestHeader[$HEADER_AUTHORIZATION] = $authorizationHeaderValue
+    return $HttpSignedRequestHeader
 }
 
 <#
 .SYNOPSIS
-    Gets the headers for http signed auth.
+    Gets the RSA signature
 
 .DESCRIPTION
-    Gets the headers for the http signed auth. It use (targetpath), date, host and body digest to create authorization header.
-.PARAMETER APIKeyFilePath
+    Gets the RSA signature for the http signing 
+.PARAMETER PrivateKeyFilePath
     Specify the API key file path
 .PARAMETER DataToSign
     Specify the data to sign
+.PARAMETER HashAlgorithmName
+    HashAlgorithm to calculate the hash
+.PARAMETER KeyPassPhrase
+    KeyPassPhrase for the encrypted key
 .OUTPUTS
-    String
+    Base64String
 #>
-function Get-PSRSASHA256SignedString {
+function Get-PSRSASignature {
     Param(
-        [string]$APIKeyFilePath,
-        [byte[]]$DataToSign
+        [string]$PrivateKeyFilePath,
+        [byte[]]$DataToSign,
+        [string]$HashAlgorithmName,
+        [string]$SigningAlgorithm,
+        [securestring]$KeyPassPhrase
     )
     try {
         
-        $rsa_provider_path = Join-Path -Path $PSScriptRoot -ChildPath "PSRSAEncryptionProvider.cs"
-        $rsa_provider_sourceCode = Get-Content -Path $rsa_provider_path -Raw
-        Add-Type -TypeDefinition $rsa_provider_sourceCode
-        $signed_string = [RSAEncryption.RSAEncryptionProvider]::GetRSASignb64encode($APIKeyFilePath, $DataToSign)
-        if ($null -eq $signed_string) {
-            throw "Unable to sign the header using the API key"
+        if ($hashAlgorithmName -eq "sha256") {
+            $hashAlgo = [System.Security.Cryptography.HashAlgorithmName]::SHA256
         }
-        return $signed_string
+        elseif ($hashAlgorithmName -eq "sha512") {
+            $hashAlgo = [System.Security.Cryptography.HashAlgorithmName]::SHA512
+        }
+
+        if ($PSVersionTable.PSVersion.Major -ge 7) {
+            $ecKeyHeader = "-----BEGIN RSA PRIVATE KEY-----"
+            $ecKeyFooter = "-----END RSA PRIVATE KEY-----"
+            $keyStr = Get-Content -Path $PrivateKeyFilePath -Raw
+            $ecKeyBase64String = $keyStr.Replace($ecKeyHeader, "").Replace($ecKeyFooter, "").Trim()
+            $keyBytes = [System.Convert]::FromBase64String($ecKeyBase64String)
+            $rsa = [System.Security.Cryptography.RSACng]::new()
+            [int]$bytCount = 0
+            $rsa.ImportRSAPrivateKey($keyBytes, [ref] $bytCount)
+
+            if ($SigningAlgorithm -eq "RSASSA-PSS") {
+                $signedBytes = $rsa.SignHash($DataToSign, $hashAlgo, [System.Security.Cryptography.RSASignaturePadding]::Pss)
+            }
+            else {
+                $signedBytes = $rsa.SignHash($DataToSign, $hashAlgo, [System.Security.Cryptography.RSASignaturePadding]::Pkcs1)
+            }
+        }
+        else {
+            $rsa_provider_path = Join-Path -Path $PSScriptRoot -ChildPath "PSRSAEncryptionProvider.cs"
+            $rsa_provider_sourceCode = Get-Content -Path $rsa_provider_path -Raw
+            Add-Type -TypeDefinition $rsa_provider_sourceCode 
+    
+            [System.Security.Cryptography.RSA]$rsa = [RSAEncryption.RSAEncryptionProvider]::GetRSAProviderFromPemFile($PrivateKeyFilePath, $KeyPassPhrase)
+            
+            if ($SigningAlgorithm -eq "RSASSA-PSS") {
+                throw "$SigningAlgorithm is not supported on $($PSVersionTable.PSVersion)"
+            }
+            else {
+                $signedBytes = $rsa.SignHash($DataToSign, $hashAlgo, [System.Security.Cryptography.RSASignaturePadding]::Pkcs1)
+            }
+           
+        }
+
+        $signedString = [Convert]::ToBase64String($signedBytes)
+        return $signedString
     }
     catch {
         throw $_
     }
 }
+
+<#
+.SYNOPSIS
+    Gets the ECDSA signature
+
+.DESCRIPTION
+    Gets the ECDSA signature for the http signing 
+.PARAMETER PrivateKeyFilePath
+    Specify the API key file path
+.PARAMETER DataToSign
+    Specify the data to sign
+.PARAMETER HashAlgorithmName
+    HashAlgorithm to calculate the hash
+.PARAMETER KeyPassPhrase
+    KeyPassPhrase for the encrypted key
+.OUTPUTS
+    Base64String
+#>
+function Get-PSECDSASignature {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$ECKeyFilePath,
+        [Parameter(Mandatory = $true)]
+        [byte[]]$DataToSign,
+        [Parameter(Mandatory = $false)]
+        [String]$HashAlgorithmName,
+        [Parameter(Mandatory = $false)]
+        [securestring]$KeyPassPhrase
+    )
+    if (!(Test-Path -Path $ECKeyFilePath)) {
+        throw "key file path does not exist."
+    }
+
+    if($PSVersionTable.PSVersion.Major -lt 7){
+        throw "ECDSA key is not supported on $($PSVersionTable.PSVersion), Use PSVersion 7.0 and above"
+    }
+
+    $ecKeyHeader = "-----BEGIN EC PRIVATE KEY-----"
+    $ecKeyFooter = "-----END EC PRIVATE KEY-----"
+    $keyStr = Get-Content -Path $ECKeyFilePath -Raw
+    $ecKeyBase64String = $keyStr.Replace($ecKeyHeader, "").Replace($ecKeyFooter, "").Trim()
+    $keyBytes = [System.Convert]::FromBase64String($ecKeyBase64String)
+
+    #$cngKey = [System.Security.Cryptography.CngKey]::Import($keyBytes,[System.Security.Cryptography.CngKeyBlobFormat]::Pkcs8PrivateBlob)
+    #$ecdsa = [System.Security.Cryptography.ECDsaCng]::New($cngKey)
+    $ecdsa = [System.Security.Cryptography.ECDsaCng]::New()
+    [int]$bytCount =0
+    if(![string]::IsNullOrEmpty($KeyPassPhrase)){
+        $ecdsa.ImportEncryptedPkcs8PrivateKey($KeyPassPhrase,$keyBytes,[ref]$bytCount)
+    }
+    else{
+    $ecdsa.ImportPkcs8PrivateKey($keyBytes,[ref]$bytCount)
+    }
+    
+    if ($HashAlgorithmName -eq "sha512") {
+        $ecdsa.HashAlgorithm = [System.Security.Cryptography.CngAlgorithm]::Sha512
+    }
+    else {
+        $ecdsa.HashAlgorithm = [System.Security.Cryptography.CngAlgorithm]::Sha256
+    }
+
+    $signedBytes = $ecdsa.SignHash($DataToSign)
+    $signedString = [System.Convert]::ToBase64String($signedBytes)
+    return $signedString
+
+}
+
+
 <#
 .Synopsis
     Gets the hash of string.
 .Description
     Gets the hash of string
+.Parameter String
+    Specifies the string to calculate the hash
+.Parameter HashName
+    Specifies the hash name to calculate the hash, Accepted values are "SHA1", "SHA256" and "SHA512"
+    It is recommneded not to use "SHA1" to calculate the Hash
 .Outputs
 String 
 #>
-Function Get-PSStringHash([String] $String, $HashName = "SHA256") { 
-
+Function Get-PSStringHash {
+    param(
+        [Parameter(Mandatory = $true)]
+        [AllowEmptyString()]
+        [string]$String,
+        [Parameter(Mandatory = $true)]
+        [ValidateSet("SHA1", "SHA256", "SHA512")]
+        $HashName
+    ) 
     $hashAlogrithm = [System.Security.Cryptography.HashAlgorithm]::Create($HashName)
     $hashAlogrithm.ComputeHash([System.Text.Encoding]::UTF8.GetBytes($String)) 
+}
+
+<#
+.Synopsis
+    Gets the Unix time.
+.Description
+    Gets the Unix time
+.Parameter Date
+    Specifies the date to calculate the unix time
+.Parameter ToTalTime
+    Specifies the total time , Accepted values are "TotalDays", "TotalHours", "TotalMinutes", "TotalSeconds" and "TotalMilliseconds"
+.Outputs
+Integer
+#>
+function Get-PSUnixTime {
+    param(
+        [Parameter(Mandatory = $true)]
+        [DateTime]$Date,
+        [Parameter(Mandatory = $false)]
+        [ValidateSet("TotalDays", "TotalHours", "TotalMinutes", "TotalSeconds", "TotalMilliseconds")]
+        [string]$TotalTime = "TotalSeconds"
+    )
+    $date1 = Get-Date -Date "01/01/1970"
+    $timespan = New-TimeSpan -Start $date1 -End $Date
+    switch ($TotalTime) {
+        "TotalDays" { [int]$timespan.TotalDays }
+        "TotalHours" { [int]$timespan.TotalHours }
+        "TotalMinutes" { [int]$timespan.TotalMinutes }
+        "TotalSeconds" { [int]$timespan.TotalSeconds }
+        "TotalMilliseconds" { [int]$timespan.TotalMilliseconds }
+    }
+}
+
+function Get-PSCryptographicScheme {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$SigningAlgorithm,
+        [Parameter(Mandatory = $true)]
+        [string]$HashAlgorithm
+    )
+    $rsaSigntureType = @("RSASSA-PKCS1-v1_5", "RSASSA-PSS")
+    $SigningAlgorithm = $null
+    if ($rsaSigntureType -contains $SigningAlgorithm) {
+        switch ($HashAlgorithm) {
+            "sha256" { $SigningAlgorithm = "rsa-sha256" }
+            "sha512" { $SigningAlgorithm = "rsa-sha512" }
+        }
+    }
+    return $SigningAlgorithm
+}
+
+
+<#
+.Synopsis
+    Gets the key type from the pem file.
+.Description
+    Gets the key type from the pem file.
+.Parameter KeyFilePath
+    Specifies the key file path (pem file)
+.Outputs
+String
+#>
+function Get-PSKeyTypeFromFile {
+    param(
+        [Parameter(Mandatory = $true)]
+        [string]$KeyFilePath
+    )
+
+    if (-not(Test-Path -Path $KeyFilePath)) {
+        throw "Key file path does not exist."
+    }
+    $ecPrivateKeyHeader = "BEGIN EC PRIVATE KEY"
+    $ecPrivateKeyFooter = "END EC PRIVATE KEY"
+    $rsaPrivateKeyHeader = "BEGIN RSA PRIVATE KEY"
+    $rsaPrivateFooter = "END RSA PRIVATE KEY"
+    $pkcs8Header = "BEGIN PRIVATE KEY"
+    $pkcs8Footer = "END PRIVATE KEY"
+    $keyType = $null
+    $key = Get-Content -Path $KeyFilePath
+
+    if ($key[0] -match $rsaPrivateKeyHeader -and $key[$key.Length - 1] -match $rsaPrivateFooter) {
+        $KeyType = "RSA"
+
+    }
+    elseif ($key[0] -match $ecPrivateKeyHeader -and $key[$key.Length - 1] -match $ecPrivateKeyFooter) {
+        $keyType = "EC"
+    }
+    elseif ($key[0] -match $ecPrivateKeyHeader -and $key[$key.Length - 1] -match $ecPrivateKeyFooter) {
+        <#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
+        $keyType = "EC"
+    }
+    else {
+        throw "Either the key is invalid or key is not supported"
+    }
+    return $keyType   
 }
\ No newline at end of file
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Private/PSRSAEncryptionProvider.cs b/samples/client/petstore/powershell/src/PSPetstore/Private/PSRSAEncryptionProvider.cs
index a23490b366e..7a671929fb2 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Private/PSRSAEncryptionProvider.cs
+++ b/samples/client/petstore/powershell/src/PSPetstore/Private/PSRSAEncryptionProvider.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Net;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Cryptography;
@@ -10,15 +11,97 @@ namespace RSAEncryption
 {
     public class RSAEncryptionProvider
     {
+        public static RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile,SecureString keyPassPharse = null)
+        {
+            const String pempubheader = "-----BEGIN PUBLIC KEY-----";
+            const String pempubfooter = "-----END PUBLIC KEY-----";
+            bool isPrivateKeyFile = true;
+            byte[] pemkey = null;
+
+            if (!File.Exists(pemfile))
+            {
+                throw new Exception("private key file does not exist.");
+            }
+            string pemstr = File.ReadAllText(pemfile).Trim();
+
+            if (pemstr.StartsWith(pempubheader) && pemstr.EndsWith(pempubfooter))
+            {
+                isPrivateKeyFile = false;
+            }
+
+            if (isPrivateKeyFile)
+            {
+                pemkey = ConvertPrivateKeyToBytes(pemstr,keyPassPharse);
+                if (pemkey == null)
+                {
+                    return null;
+                }
+                return DecodeRSAPrivateKey(pemkey);
+            }
+            return null ;
+        }
+
+        static byte[] ConvertPrivateKeyToBytes(String instr, SecureString keyPassPharse = null)
+        {
+            const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
+            const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
+            String pemstr = instr.Trim();
+            byte[] binkey;
+
+            if (!pemstr.StartsWith(pemprivheader) || !pemstr.EndsWith(pemprivfooter))
+            {
+                return null;
+            }
+
+            StringBuilder sb = new StringBuilder(pemstr);
+            sb.Replace(pemprivheader, "");
+            sb.Replace(pemprivfooter, "");
+            String pvkstr = sb.ToString().Trim();
+
+            try
+            {   // if there are no PEM encryption info lines, this is an UNencrypted PEM private key
+                binkey = Convert.FromBase64String(pvkstr);
+                return binkey;
+            }
+            catch (System.FormatException)
+            {       
+                StringReader str = new StringReader(pvkstr);
+
+                //-------- 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();
+
+                try
+                {   //should have b64 encrypted RSA key now
+                    binkey = Convert.FromBase64String(encryptedstr);
+                }
+                catch (System.FormatException)
+                {   //data is not in base64 fromat
+                    return null;
+                }
+
+                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
+                return rsakey;
+            }
+        }
 
-        const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
-        const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
-        const String pempubheader = "-----BEGIN PUBLIC KEY-----";
-        const String pempubfooter = "-----END PUBLIC KEY-----";
-        const String pemp8header = "-----BEGIN PRIVATE KEY-----";
-        const String pemp8footer = "-----END PRIVATE KEY-----";
-        const String pemp8encheader = "-----BEGIN ENCRYPTED PRIVATE KEY-----";
-        const String pemp8encfooter = "-----END ENCRYPTED PRIVATE KEY-----";
         public static RSACryptoServiceProvider DecodeRSAPrivateKey(byte[] privkey)
         {
             byte[] MODULUS, E, D, P, Q, DP, DQ, IQ;
@@ -46,7 +129,6 @@ namespace RSAEncryption
                 if (bt != 0x00)
                     return null;
 
-
                 //------  all private key components are Integer sequences ----
                 elems = GetIntegerSize(binr);
                 MODULUS = binr.ReadBytes(elems);
@@ -72,19 +154,6 @@ namespace RSAEncryption
                 elems = GetIntegerSize(binr);
                 IQ = binr.ReadBytes(elems);
 
-                /*Console.WriteLine("showing components ..");
-                if (true)
-                {
-                    showBytes("\nModulus", MODULUS);
-                    showBytes("\nExponent", E);
-                    showBytes("\nD", D);
-                    showBytes("\nP", P);
-                    showBytes("\nQ", Q);
-                    showBytes("\nDP", DP);
-                    showBytes("\nDQ", DQ);
-                    showBytes("\nIQ", IQ);
-                }*/
-
                 // ------- create RSACryptoServiceProvider instance and initialize with public key -----
                 RSACryptoServiceProvider RSA = new RSACryptoServiceProvider();
                 RSAParameters RSAparams = new RSAParameters();
@@ -140,94 +209,17 @@ namespace RSAEncryption
             return count;
         }
 
-        static byte[] DecodeOpenSSLPrivateKey(String instr)
-        {
-            const String pemprivheader = "-----BEGIN RSA PRIVATE KEY-----";
-            const String pemprivfooter = "-----END RSA PRIVATE KEY-----";
-            String pemstr = instr.Trim();
-            byte[] binkey;
-            if (!pemstr.StartsWith(pemprivheader) || !pemstr.EndsWith(pemprivfooter))
-                return null;
-
-            StringBuilder sb = new StringBuilder(pemstr);
-            sb.Replace(pemprivheader, "");  //remove headers/footers, if present
-            sb.Replace(pemprivfooter, "");
-
-            String pvkstr = sb.ToString().Trim();   //get string after removing leading/trailing whitespace
-
-            try
-            {        // if there are no PEM encryption info lines, this is an UNencrypted PEM private key
-                binkey = Convert.FromBase64String(pvkstr);
-                return binkey;
-            }
-            catch (System.FormatException)
-            {       //if can't b64 decode, it must be an encrypted private key
-                    //Console.WriteLine("Not an unencrypted OpenSSL PEM private key");  
-            }
-
-            StringReader str = new StringReader(pvkstr);
-
-            //-------- 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();
-
-            try
-            {   //should have b64 encrypted RSA key now
-                binkey = Convert.FromBase64String(encryptedstr);
-            }
-            catch (System.FormatException)
-            {  // bad b64 data.
-                return null;
-            }
-
-            //------ Get the 3DES 24 byte key using PDK used by OpenSSL ----
-
-            SecureString despswd = GetSecPswd("Enter password to derive 3DES key==>");
-            //Console.Write("\nEnter password to derive 3DES key: ");
-            //String pswd = Console.ReadLine();
-            byte[] deskey = GetOpenSSL3deskey(salt, despswd, 1, 2);    // count=1 (for OpenSSL implementation); 2 iterations to get at least 24 bytes
-            if (deskey == null)
-                return null;
-            //showBytes("3DES key", deskey) ;
-
-            //------ 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
-            if (rsakey != null)
-                return rsakey;  //we have a decrypted RSA private key
-            else
-            {
-                Console.WriteLine("Failed to decrypt RSA private key; probably wrong password.");
-                return null;
-            }
-        }
-
-        static byte[] GetOpenSSL3deskey(byte[] salt, SecureString secpswd, int count, int miter)
+        static byte[] GetEncryptedKey(byte[] salt, SecureString secpswd, int count, int miter)
         {
             IntPtr unmanagedPswd = IntPtr.Zero;
             int HASHLENGTH = 16;    //MD5 bytes
             byte[] keymaterial = new byte[HASHLENGTH * miter];     //to store contatenated Mi hashed results
 
-
             byte[] psbytes = new byte[secpswd.Length];
             unmanagedPswd = Marshal.SecureStringToGlobalAllocAnsi(secpswd);
             Marshal.Copy(unmanagedPswd, psbytes, 0, psbytes.Length);
             Marshal.ZeroFreeGlobalAllocAnsi(unmanagedPswd);
 
-            //UTF8Encoding utf8 = new UTF8Encoding();
-            //byte[] psbytes = utf8.GetBytes(pswd);
-
             // --- contatenate salt and pswd bytes into fixed data array ---
             byte[] data00 = new byte[psbytes.Length + salt.Length];
             Array.Copy(psbytes, data00, psbytes.Length);      //copy the pswd bytes
@@ -248,15 +240,12 @@ namespace RSAEncryption
                     Array.Copy(result, hashtarget, result.Length);
                     Array.Copy(data00, 0, hashtarget, result.Length, data00.Length);
                     result = hashtarget;
-                    //Console.WriteLine("Updated new initial hash target:") ;
-                    //showBytes(result) ;
                 }
 
                 for (int i = 0; i < count; i++)
                     result = md5.ComputeHash(result);
                 Array.Copy(result, 0, keymaterial, j * HASHLENGTH, result.Length);  //contatenate to keymaterial
             }
-            //showBytes("Final key material", keymaterial);
             byte[] deskey = new byte[24];
             Array.Copy(keymaterial, deskey, deskey.Length);
 
@@ -265,46 +254,9 @@ namespace RSAEncryption
             Array.Clear(result, 0, result.Length);
             Array.Clear(hashtarget, 0, hashtarget.Length);
             Array.Clear(keymaterial, 0, keymaterial.Length);
-
             return deskey;
         }
 
-        public static string GetRSASignb64encode(string private_key_path, byte[] digest)
-        {
-            RSACryptoServiceProvider cipher = new RSACryptoServiceProvider();
-            cipher = GetRSAProviderFromPemFile(private_key_path);
-            RSAPKCS1SignatureFormatter RSAFormatter = new RSAPKCS1SignatureFormatter(cipher);
-            RSAFormatter.SetHashAlgorithm("SHA256");
-            byte[] signedHash = RSAFormatter.CreateSignature(digest);
-            return Convert.ToBase64String(signedHash);
-        }
-
-        public static RSACryptoServiceProvider GetRSAProviderFromPemFile(String pemfile)
-        {
-            bool isPrivateKeyFile = true;
-            if (!File.Exists(pemfile))
-            {
-                throw new Exception("pemfile does not exist.");
-            }
-            string pemstr = File.ReadAllText(pemfile).Trim();
-            if (pemstr.StartsWith(pempubheader) && pemstr.EndsWith(pempubfooter))
-                isPrivateKeyFile = false;
-
-            byte[] pemkey = null;
-            if (isPrivateKeyFile)
-                pemkey = DecodeOpenSSLPrivateKey(pemstr);
-
-
-            if (pemkey == null)
-                return null;
-
-            if (isPrivateKeyFile)
-            {
-                return DecodeRSAPrivateKey(pemkey);
-            }
-            return null;
-        }
-
         static byte[] DecryptKey(byte[] cipherData, byte[] desKey, byte[] IV)
         {
             MemoryStream memst = new MemoryStream();
@@ -317,61 +269,11 @@ namespace RSAEncryption
                 cs.Write(cipherData, 0, cipherData.Length);
                 cs.Close();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine(exc.Message);
+            catch (Exception){
                 return null;
             }
             byte[] decryptedData = memst.ToArray();
             return decryptedData;
         }
-
-        static SecureString GetSecPswd(String prompt)
-        {
-            SecureString password = new SecureString();
-
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.ForegroundColor = ConsoleColor.Magenta;
-
-            while (true)
-            {
-                ConsoleKeyInfo cki = Console.ReadKey(true);
-                if (cki.Key == ConsoleKey.Enter)
-                {
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                    return password;
-                }
-                else if (cki.Key == ConsoleKey.Backspace)
-                {
-                    // remove the last asterisk from the screen...
-                    if (password.Length > 0)
-                    {
-                        Console.SetCursorPosition(Console.CursorLeft - 1, Console.CursorTop);
-                        Console.SetCursorPosition(Console.CursorLeft - 1, Console.CursorTop);
-                        password.RemoveAt(password.Length - 1);
-                    }
-                }
-                else if (cki.Key == ConsoleKey.Escape)
-                {
-                    Console.ForegroundColor = ConsoleColor.Gray;
-                    return password;
-                }
-                else if (Char.IsLetterOrDigit(cki.KeyChar) || Char.IsSymbol(cki.KeyChar))
-                {
-                    if (password.Length < 20)
-                    {
-                        password.AppendChar(cki.KeyChar);
-                    }
-                    else
-                    {
-                        Console.Beep();
-                    }
-                }
-                else
-                {
-                    Console.Beep();
-                }
-            }
-        }
     }
-}
+}
\ No newline at end of file

From 66a3ec7cf07b273e4f9d1f78435ab426677659e4 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Tue, 2 Jun 2020 16:50:35 +0800
Subject: [PATCH 05/22] add oneof discrimistrator lookup to go experimental
 (#6517)

---
 docs/generators/go-experimental.md            |  1 +
 .../GoClientExperimentalCodegen.java          | 17 ++++++++++
 .../go-experimental/model_oneof.mustache      | 33 ++++++++++++++++++-
 .../go-petstore/model_fruit.go                |  1 +
 .../go-petstore/model_fruit_req.go            |  1 +
 .../go-petstore/model_mammal.go               |  1 +
 6 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/docs/generators/go-experimental.md b/docs/generators/go-experimental.md
index d5298fd44f1..5866c95004e 100644
--- a/docs/generators/go-experimental.md
+++ b/docs/generators/go-experimental.md
@@ -12,6 +12,7 @@ sidebar_label: go-experimental
 |packageVersion|Go package version.| |1.0.0|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |structPrefix|whether to prefix struct with the class name. e.g. DeletePetOpts =&gt; PetApiDeletePetOpts| |false|
+|useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and onlye one match in oneOf's schemas) will be skipped.| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support| |false|
 |withGoCodegenComment|whether to include Go codegen comment to disable Go Lint and collapse by default in GitHub PRs and diffs| |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|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
index a72d18959b1..ddb10684f2a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
@@ -35,6 +35,7 @@ public class GoClientExperimentalCodegen extends GoClientCodegen {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GoClientExperimentalCodegen.class);
     protected String goImportAlias = "openapiclient";
+    protected boolean useOneOfDiscriminatorLookup = false; // use oneOf discriminator's mapping for model lookup
 
     public GoClientExperimentalCodegen() {
         super();
@@ -44,6 +45,8 @@ public class GoClientExperimentalCodegen extends GoClientCodegen {
         usesOptionals = false;
 
         generatorMetadata = GeneratorMetadata.newBuilder(generatorMetadata).stability(Stability.EXPERIMENTAL).build();
+
+        cliOptions.add(new CliOption(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP_DESC).defaultValue("false"));
     }
 
     /**
@@ -93,6 +96,20 @@ public class GoClientExperimentalCodegen extends GoClientCodegen {
             additionalProperties.put("goImportAlias", goImportAlias);
         }
 
+        if (additionalProperties.containsKey(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP)) {
+            setUseOneOfDiscriminatorLookup(convertPropertyToBooleanAndWriteBack(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP));
+        } else {
+            additionalProperties.put(CodegenConstants.USE_ONEOF_DISCRIMINATOR_LOOKUP, useOneOfDiscriminatorLookup);
+        }
+
+    }
+
+    public void setUseOneOfDiscriminatorLookup(boolean useOneOfDiscriminatorLookup) {
+        this.useOneOfDiscriminatorLookup = useOneOfDiscriminatorLookup;
+    }
+
+    public boolean getUseOneOfDiscriminatorLookup() {
+        return this.useOneOfDiscriminatorLookup;
     }
 
     public void setGoImportAlias(String goImportAlias) {
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
index 20cb13d541b..bbd9aeeccce 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
@@ -24,6 +24,37 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	}
 
 	{{/isNullable}}
+    {{#useOneOfDiscriminatorLookup}}
+    {{#discriminator}}
+    {{#mappedModels}}
+    {{#-first}}
+    // use discriminator value to speed up the lookup
+    var jsonDict map[string]interface{}
+    err := json.Unmarshal(data, &jsonDict)
+    if err != nil {
+        return fmt.Errorf("Failed to unmarshal JSON into map for the discrimintor lookup.")
+    }
+
+    {{/-first}}
+    // check if the discriminator value is '{{{mappingName}}}'
+    if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
+        // try to unmarshal JSON data into {{{modelName}}}
+        err = json.Unmarshal(data, &dst.{{{modelName}}});
+        if err == nil {
+            json{{{modelName}}}, _ := json.Marshal(dst.{{{modelName}}})
+            if string(json{{{modelName}}}) == "{}" { // empty struct
+                dst.{{{modelName}}} = nil
+            } else {
+                return nil // data stored in dst.{{{modelName}}}, return on the first match
+            }
+        } else {
+            dst.{{{modelName}}} = nil
+        }
+    }
+
+    {{/mappedModels}}
+    {{/discriminator}}
+    {{/useOneOfDiscriminatorLookup}}
 	{{#oneOf}}
 	// try to unmarshal data into {{{.}}}
 	err = json.Unmarshal(data, &dst.{{{.}}});
@@ -76,4 +107,4 @@ func (obj *{{classname}}) GetActualInstance() (interface{}) {
 	return nil
 }
 
-{{>nullable_model}}
\ No newline at end of file
+{{>nullable_model}}
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
index ec7e137f352..416ae81c718 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
@@ -137,3 +137,4 @@ func (v *NullableFruit) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
index b70da598b42..dce03284f0f 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
@@ -137,3 +137,4 @@ func (v *NullableFruitReq) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
index a3af711d6f3..e9731f1d550 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
@@ -137,3 +137,4 @@ func (v *NullableMammal) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+

From 8fc7ec84580693a686b7cf4c84f82cc8822d8b8e Mon Sep 17 00:00:00 2001
From: Justin Van Dort <jtvd78@aol.com>
Date: Tue, 2 Jun 2020 06:46:30 -0400
Subject: [PATCH 06/22] Typescript-rxjs: print param name (#6368)

* Prints out the parameter name in throwIfNullOrUndefined

* Fixed misspelling

Co-authored-by: Justin Van Dort <justinvandort@gmail.com>
Co-authored-by: Esteban Gehring <esteban.gehring@bithost.ch>
---
 .../resources/typescript-rxjs/apis.mustache    |  2 +-
 .../resources/typescript-rxjs/runtime.mustache |  4 ++--
 .../builds/default/apis/PetApi.ts              | 16 ++++++++--------
 .../builds/default/apis/StoreApi.ts            |  6 +++---
 .../builds/default/apis/UserApi.ts             | 18 +++++++++---------
 .../typescript-rxjs/builds/default/runtime.ts  |  4 ++--
 .../builds/es6-target/apis/PetApi.ts           | 16 ++++++++--------
 .../builds/es6-target/apis/StoreApi.ts         |  6 +++---
 .../builds/es6-target/apis/UserApi.ts          | 18 +++++++++---------
 .../builds/es6-target/runtime.ts               |  4 ++--
 .../builds/with-interfaces/apis/PetApi.ts      | 16 ++++++++--------
 .../builds/with-interfaces/apis/StoreApi.ts    |  6 +++---
 .../builds/with-interfaces/apis/UserApi.ts     | 18 +++++++++---------
 .../builds/with-interfaces/runtime.ts          |  4 ++--
 .../builds/with-npm-version/apis/PetApi.ts     | 16 ++++++++--------
 .../builds/with-npm-version/apis/StoreApi.ts   |  6 +++---
 .../builds/with-npm-version/apis/UserApi.ts    | 18 +++++++++---------
 .../builds/with-npm-version/runtime.ts         |  4 ++--
 18 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index 6fc3928c487..4aae18a02f0 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -41,7 +41,7 @@ export class {{classname}} extends BaseAPI {
         {{#hasParams}}
         {{#allParams}}
         {{#required}}
-        throwIfNullOrUndefined({{> paramNamePartial}}, '{{nickname}}');
+        throwIfNullOrUndefined({{> paramNamePartial}}, '{{> paramNamePartial}}', '{{nickname}}');
         {{/required}}
         {{/allParams}}
 
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
index 97989df889a..db845a85945 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -178,9 +178,9 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 };
 
-export const throwIfNullOrUndefined = (value: any, nickname?: string) => {
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
     if (value == null) {
-        throw new Error(`Parameter "${value}" was null or undefined when calling "${nickname}".`);
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
     }
 };
 
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
index 3b3232c44db..021781fd7ab 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
@@ -64,7 +64,7 @@ export class PetApi extends BaseAPI {
      * Add a new pet to the store
      */
     addPet = ({ body }: AddPetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'addPet');
+        throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -89,7 +89,7 @@ export class PetApi extends BaseAPI {
      * Deletes a pet
      */
     deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'deletePet');
+        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
             ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
@@ -114,7 +114,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by status
      */
     findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(status, 'findPetsByStatus');
+        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -143,7 +143,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by tags
      */
     findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(tags, 'findPetsByTags');
+        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -172,7 +172,7 @@ export class PetApi extends BaseAPI {
      * Find pet by ID
      */
     getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
-        throwIfNullOrUndefined(petId, 'getPetById');
+        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
@@ -189,7 +189,7 @@ export class PetApi extends BaseAPI {
      * Update an existing pet
      */
     updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'updatePet');
+        throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -214,7 +214,7 @@ export class PetApi extends BaseAPI {
      * Updates a pet in the store with form data
      */
     updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'updatePetWithForm');
+        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -242,7 +242,7 @@ export class PetApi extends BaseAPI {
      * uploads an image
      */
     uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
-        throwIfNullOrUndefined(petId, 'uploadFile');
+        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
             // oauth required
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
index aac36206d60..8ce04d16aa0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
@@ -39,7 +39,7 @@ export class StoreApi extends BaseAPI {
      * Delete purchase order by ID
      */
     deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
-        throwIfNullOrUndefined(orderId, 'deleteOrder');
+        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -68,7 +68,7 @@ export class StoreApi extends BaseAPI {
      * Find purchase order by ID
      */
     getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
-        throwIfNullOrUndefined(orderId, 'getOrderById');
+        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -80,7 +80,7 @@ export class StoreApi extends BaseAPI {
      * Place an order for a pet
      */
     placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
-        throwIfNullOrUndefined(body, 'placeOrder');
+        throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
index 1b3c07eea4f..a223874786e 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
@@ -57,7 +57,7 @@ export class UserApi extends BaseAPI {
      * Create user
      */
     createUser = ({ body }: CreateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUser');
+        throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -75,7 +75,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithArrayInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -93,7 +93,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithListInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -112,7 +112,7 @@ export class UserApi extends BaseAPI {
      * Delete user
      */
     deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'deleteUser');
+        throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -124,7 +124,7 @@ export class UserApi extends BaseAPI {
      * Get user by user name
      */
     getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
-        throwIfNullOrUndefined(username, 'getUserByName');
+        throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -136,8 +136,8 @@ export class UserApi extends BaseAPI {
      * Logs user into the system
      */
     loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
-        throwIfNullOrUndefined(username, 'loginUser');
-        throwIfNullOrUndefined(password, 'loginUser');
+        throwIfNullOrUndefined(username, 'username', 'loginUser');
+        throwIfNullOrUndefined(password, 'password', 'loginUser');
 
         const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
             'username': username,
@@ -166,8 +166,8 @@ export class UserApi extends BaseAPI {
      * Updated user
      */
     updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'updateUser');
-        throwIfNullOrUndefined(body, 'updateUser');
+        throwIfNullOrUndefined(username, 'username', 'updateUser');
+        throwIfNullOrUndefined(body, 'body', 'updateUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
index ad383a11642..42ddef55ae1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
@@ -189,9 +189,9 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 };
 
-export const throwIfNullOrUndefined = (value: any, nickname?: string) => {
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
     if (value == null) {
-        throw new Error(`Parameter "${value}" was null or undefined when calling "${nickname}".`);
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
     }
 };
 
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
index 3b3232c44db..021781fd7ab 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
@@ -64,7 +64,7 @@ export class PetApi extends BaseAPI {
      * Add a new pet to the store
      */
     addPet = ({ body }: AddPetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'addPet');
+        throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -89,7 +89,7 @@ export class PetApi extends BaseAPI {
      * Deletes a pet
      */
     deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'deletePet');
+        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
             ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
@@ -114,7 +114,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by status
      */
     findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(status, 'findPetsByStatus');
+        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -143,7 +143,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by tags
      */
     findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(tags, 'findPetsByTags');
+        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -172,7 +172,7 @@ export class PetApi extends BaseAPI {
      * Find pet by ID
      */
     getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
-        throwIfNullOrUndefined(petId, 'getPetById');
+        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
@@ -189,7 +189,7 @@ export class PetApi extends BaseAPI {
      * Update an existing pet
      */
     updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'updatePet');
+        throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -214,7 +214,7 @@ export class PetApi extends BaseAPI {
      * Updates a pet in the store with form data
      */
     updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'updatePetWithForm');
+        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -242,7 +242,7 @@ export class PetApi extends BaseAPI {
      * uploads an image
      */
     uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
-        throwIfNullOrUndefined(petId, 'uploadFile');
+        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
             // oauth required
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
index aac36206d60..8ce04d16aa0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
@@ -39,7 +39,7 @@ export class StoreApi extends BaseAPI {
      * Delete purchase order by ID
      */
     deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
-        throwIfNullOrUndefined(orderId, 'deleteOrder');
+        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -68,7 +68,7 @@ export class StoreApi extends BaseAPI {
      * Find purchase order by ID
      */
     getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
-        throwIfNullOrUndefined(orderId, 'getOrderById');
+        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -80,7 +80,7 @@ export class StoreApi extends BaseAPI {
      * Place an order for a pet
      */
     placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
-        throwIfNullOrUndefined(body, 'placeOrder');
+        throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
index 1b3c07eea4f..a223874786e 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
@@ -57,7 +57,7 @@ export class UserApi extends BaseAPI {
      * Create user
      */
     createUser = ({ body }: CreateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUser');
+        throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -75,7 +75,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithArrayInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -93,7 +93,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithListInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -112,7 +112,7 @@ export class UserApi extends BaseAPI {
      * Delete user
      */
     deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'deleteUser');
+        throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -124,7 +124,7 @@ export class UserApi extends BaseAPI {
      * Get user by user name
      */
     getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
-        throwIfNullOrUndefined(username, 'getUserByName');
+        throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -136,8 +136,8 @@ export class UserApi extends BaseAPI {
      * Logs user into the system
      */
     loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
-        throwIfNullOrUndefined(username, 'loginUser');
-        throwIfNullOrUndefined(password, 'loginUser');
+        throwIfNullOrUndefined(username, 'username', 'loginUser');
+        throwIfNullOrUndefined(password, 'password', 'loginUser');
 
         const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
             'username': username,
@@ -166,8 +166,8 @@ export class UserApi extends BaseAPI {
      * Updated user
      */
     updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'updateUser');
-        throwIfNullOrUndefined(body, 'updateUser');
+        throwIfNullOrUndefined(username, 'username', 'updateUser');
+        throwIfNullOrUndefined(body, 'body', 'updateUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
index ad383a11642..42ddef55ae1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
@@ -189,9 +189,9 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 };
 
-export const throwIfNullOrUndefined = (value: any, nickname?: string) => {
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
     if (value == null) {
-        throw new Error(`Parameter "${value}" was null or undefined when calling "${nickname}".`);
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
     }
 };
 
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
index 3b3232c44db..021781fd7ab 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
@@ -64,7 +64,7 @@ export class PetApi extends BaseAPI {
      * Add a new pet to the store
      */
     addPet = ({ body }: AddPetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'addPet');
+        throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -89,7 +89,7 @@ export class PetApi extends BaseAPI {
      * Deletes a pet
      */
     deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'deletePet');
+        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
             ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
@@ -114,7 +114,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by status
      */
     findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(status, 'findPetsByStatus');
+        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -143,7 +143,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by tags
      */
     findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(tags, 'findPetsByTags');
+        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -172,7 +172,7 @@ export class PetApi extends BaseAPI {
      * Find pet by ID
      */
     getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
-        throwIfNullOrUndefined(petId, 'getPetById');
+        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
@@ -189,7 +189,7 @@ export class PetApi extends BaseAPI {
      * Update an existing pet
      */
     updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'updatePet');
+        throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -214,7 +214,7 @@ export class PetApi extends BaseAPI {
      * Updates a pet in the store with form data
      */
     updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'updatePetWithForm');
+        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -242,7 +242,7 @@ export class PetApi extends BaseAPI {
      * uploads an image
      */
     uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
-        throwIfNullOrUndefined(petId, 'uploadFile');
+        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
             // oauth required
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
index aac36206d60..8ce04d16aa0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
@@ -39,7 +39,7 @@ export class StoreApi extends BaseAPI {
      * Delete purchase order by ID
      */
     deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
-        throwIfNullOrUndefined(orderId, 'deleteOrder');
+        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -68,7 +68,7 @@ export class StoreApi extends BaseAPI {
      * Find purchase order by ID
      */
     getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
-        throwIfNullOrUndefined(orderId, 'getOrderById');
+        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -80,7 +80,7 @@ export class StoreApi extends BaseAPI {
      * Place an order for a pet
      */
     placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
-        throwIfNullOrUndefined(body, 'placeOrder');
+        throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
index 1b3c07eea4f..a223874786e 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
@@ -57,7 +57,7 @@ export class UserApi extends BaseAPI {
      * Create user
      */
     createUser = ({ body }: CreateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUser');
+        throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -75,7 +75,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithArrayInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -93,7 +93,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithListInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -112,7 +112,7 @@ export class UserApi extends BaseAPI {
      * Delete user
      */
     deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'deleteUser');
+        throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -124,7 +124,7 @@ export class UserApi extends BaseAPI {
      * Get user by user name
      */
     getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
-        throwIfNullOrUndefined(username, 'getUserByName');
+        throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -136,8 +136,8 @@ export class UserApi extends BaseAPI {
      * Logs user into the system
      */
     loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
-        throwIfNullOrUndefined(username, 'loginUser');
-        throwIfNullOrUndefined(password, 'loginUser');
+        throwIfNullOrUndefined(username, 'username', 'loginUser');
+        throwIfNullOrUndefined(password, 'password', 'loginUser');
 
         const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
             'username': username,
@@ -166,8 +166,8 @@ export class UserApi extends BaseAPI {
      * Updated user
      */
     updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'updateUser');
-        throwIfNullOrUndefined(body, 'updateUser');
+        throwIfNullOrUndefined(username, 'username', 'updateUser');
+        throwIfNullOrUndefined(body, 'body', 'updateUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
index ad383a11642..42ddef55ae1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
@@ -189,9 +189,9 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 };
 
-export const throwIfNullOrUndefined = (value: any, nickname?: string) => {
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
     if (value == null) {
-        throw new Error(`Parameter "${value}" was null or undefined when calling "${nickname}".`);
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
     }
 };
 
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
index 3b3232c44db..021781fd7ab 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
@@ -64,7 +64,7 @@ export class PetApi extends BaseAPI {
      * Add a new pet to the store
      */
     addPet = ({ body }: AddPetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'addPet');
+        throwIfNullOrUndefined(body, 'body', 'addPet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -89,7 +89,7 @@ export class PetApi extends BaseAPI {
      * Deletes a pet
      */
     deletePet = ({ petId, apiKey }: DeletePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'deletePet');
+        throwIfNullOrUndefined(petId, 'petId', 'deletePet');
 
         const headers: HttpHeaders = {
             ...(apiKey != null ? { 'api_key': String(apiKey) } : undefined),
@@ -114,7 +114,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by status
      */
     findPetsByStatus = ({ status }: FindPetsByStatusRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(status, 'findPetsByStatus');
+        throwIfNullOrUndefined(status, 'status', 'findPetsByStatus');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -143,7 +143,7 @@ export class PetApi extends BaseAPI {
      * Finds Pets by tags
      */
     findPetsByTags = ({ tags }: FindPetsByTagsRequest): Observable<Array<Pet>> => {
-        throwIfNullOrUndefined(tags, 'findPetsByTags');
+        throwIfNullOrUndefined(tags, 'tags', 'findPetsByTags');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -172,7 +172,7 @@ export class PetApi extends BaseAPI {
      * Find pet by ID
      */
     getPetById = ({ petId }: GetPetByIdRequest): Observable<Pet> => {
-        throwIfNullOrUndefined(petId, 'getPetById');
+        throwIfNullOrUndefined(petId, 'petId', 'getPetById');
 
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
@@ -189,7 +189,7 @@ export class PetApi extends BaseAPI {
      * Update an existing pet
      */
     updatePet = ({ body }: UpdatePetRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'updatePet');
+        throwIfNullOrUndefined(body, 'body', 'updatePet');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -214,7 +214,7 @@ export class PetApi extends BaseAPI {
      * Updates a pet in the store with form data
      */
     updatePetWithForm = ({ petId, name, status }: UpdatePetWithFormRequest): Observable<void> => {
-        throwIfNullOrUndefined(petId, 'updatePetWithForm');
+        throwIfNullOrUndefined(petId, 'petId', 'updatePetWithForm');
 
         const headers: HttpHeaders = {
             // oauth required
@@ -242,7 +242,7 @@ export class PetApi extends BaseAPI {
      * uploads an image
      */
     uploadFile = ({ petId, additionalMetadata, file }: UploadFileRequest): Observable<ApiResponse> => {
-        throwIfNullOrUndefined(petId, 'uploadFile');
+        throwIfNullOrUndefined(petId, 'petId', 'uploadFile');
 
         const headers: HttpHeaders = {
             // oauth required
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
index aac36206d60..8ce04d16aa0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
@@ -39,7 +39,7 @@ export class StoreApi extends BaseAPI {
      * Delete purchase order by ID
      */
     deleteOrder = ({ orderId }: DeleteOrderRequest): Observable<void> => {
-        throwIfNullOrUndefined(orderId, 'deleteOrder');
+        throwIfNullOrUndefined(orderId, 'orderId', 'deleteOrder');
 
         return this.request<void>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -68,7 +68,7 @@ export class StoreApi extends BaseAPI {
      * Find purchase order by ID
      */
     getOrderById = ({ orderId }: GetOrderByIdRequest): Observable<Order> => {
-        throwIfNullOrUndefined(orderId, 'getOrderById');
+        throwIfNullOrUndefined(orderId, 'orderId', 'getOrderById');
 
         return this.request<Order>({
             path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(orderId)),
@@ -80,7 +80,7 @@ export class StoreApi extends BaseAPI {
      * Place an order for a pet
      */
     placeOrder = ({ body }: PlaceOrderRequest): Observable<Order> => {
-        throwIfNullOrUndefined(body, 'placeOrder');
+        throwIfNullOrUndefined(body, 'body', 'placeOrder');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
index 1b3c07eea4f..a223874786e 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
@@ -57,7 +57,7 @@ export class UserApi extends BaseAPI {
      * Create user
      */
     createUser = ({ body }: CreateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUser');
+        throwIfNullOrUndefined(body, 'body', 'createUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -75,7 +75,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithArrayInput = ({ body }: CreateUsersWithArrayInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithArrayInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithArrayInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -93,7 +93,7 @@ export class UserApi extends BaseAPI {
      * Creates list of users with given input array
      */
     createUsersWithListInput = ({ body }: CreateUsersWithListInputRequest): Observable<void> => {
-        throwIfNullOrUndefined(body, 'createUsersWithListInput');
+        throwIfNullOrUndefined(body, 'body', 'createUsersWithListInput');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
@@ -112,7 +112,7 @@ export class UserApi extends BaseAPI {
      * Delete user
      */
     deleteUser = ({ username }: DeleteUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'deleteUser');
+        throwIfNullOrUndefined(username, 'username', 'deleteUser');
 
         return this.request<void>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -124,7 +124,7 @@ export class UserApi extends BaseAPI {
      * Get user by user name
      */
     getUserByName = ({ username }: GetUserByNameRequest): Observable<User> => {
-        throwIfNullOrUndefined(username, 'getUserByName');
+        throwIfNullOrUndefined(username, 'username', 'getUserByName');
 
         return this.request<User>({
             path: '/user/{username}'.replace('{username}', encodeURI(username)),
@@ -136,8 +136,8 @@ export class UserApi extends BaseAPI {
      * Logs user into the system
      */
     loginUser = ({ username, password }: LoginUserRequest): Observable<string> => {
-        throwIfNullOrUndefined(username, 'loginUser');
-        throwIfNullOrUndefined(password, 'loginUser');
+        throwIfNullOrUndefined(username, 'username', 'loginUser');
+        throwIfNullOrUndefined(password, 'password', 'loginUser');
 
         const query: HttpQuery = { // required parameters are used directly since they are already checked by throwIfNullOrUndefined
             'username': username,
@@ -166,8 +166,8 @@ export class UserApi extends BaseAPI {
      * Updated user
      */
     updateUser = ({ username, body }: UpdateUserRequest): Observable<void> => {
-        throwIfNullOrUndefined(username, 'updateUser');
-        throwIfNullOrUndefined(body, 'updateUser');
+        throwIfNullOrUndefined(username, 'username', 'updateUser');
+        throwIfNullOrUndefined(body, 'body', 'updateUser');
 
         const headers: HttpHeaders = {
             'Content-Type': 'application/json',
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
index ad383a11642..42ddef55ae1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
@@ -189,9 +189,9 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 };
 
-export const throwIfNullOrUndefined = (value: any, nickname?: string) => {
+export const throwIfNullOrUndefined = (value: any, paramName: string, nickname: string) => {
     if (value == null) {
-        throw new Error(`Parameter "${value}" was null or undefined when calling "${nickname}".`);
+        throw new Error(`Parameter "${paramName}" was null or undefined when calling "${nickname}".`);
     }
 };
 

From 4d68953dedb80bb8cb432cbd77ca20d421ca697b Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 3 Jun 2020 01:11:41 +0800
Subject: [PATCH 07/22] [Go][Experimental] Fix discriminator lookup (#6521)

* bug fix, better code format

* update oas3 sample
---
 .../go-experimental/model_oneof.mustache      | 60 +++++++++----------
 .../go-petstore/model_fruit.go                |  4 +-
 .../go-petstore/model_fruit_req.go            |  4 +-
 .../go-petstore/model_mammal.go               |  4 +-
 4 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
index bbd9aeeccce..c86af51efb9 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_oneof.mustache
@@ -24,40 +24,40 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	}
 
 	{{/isNullable}}
-    {{#useOneOfDiscriminatorLookup}}
-    {{#discriminator}}
-    {{#mappedModels}}
-    {{#-first}}
-    // use discriminator value to speed up the lookup
-    var jsonDict map[string]interface{}
-    err := json.Unmarshal(data, &jsonDict)
-    if err != nil {
-        return fmt.Errorf("Failed to unmarshal JSON into map for the discrimintor lookup.")
-    }
+	{{#useOneOfDiscriminatorLookup}}
+	{{#discriminator}}
+	{{#mappedModels}}
+	{{#-first}}
+	// use discriminator value to speed up the lookup
+	var jsonDict map[string]interface{}
+	err = json.Unmarshal(data, &jsonDict)
+	if err != nil {
+		return fmt.Errorf("Failed to unmarshal JSON into map for the discrimintor lookup.")
+	}
 
-    {{/-first}}
-    // check if the discriminator value is '{{{mappingName}}}'
-    if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
-        // try to unmarshal JSON data into {{{modelName}}}
-        err = json.Unmarshal(data, &dst.{{{modelName}}});
-        if err == nil {
-            json{{{modelName}}}, _ := json.Marshal(dst.{{{modelName}}})
-            if string(json{{{modelName}}}) == "{}" { // empty struct
-                dst.{{{modelName}}} = nil
-            } else {
-                return nil // data stored in dst.{{{modelName}}}, return on the first match
-            }
-        } else {
-            dst.{{{modelName}}} = nil
-        }
-    }
+	{{/-first}}
+	// check if the discriminator value is '{{{mappingName}}}'
+	if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
+		// try to unmarshal JSON data into {{{modelName}}}
+		err = json.Unmarshal(data, &dst.{{{modelName}}})
+		if err == nil {
+			json{{{modelName}}}, _ := json.Marshal(dst.{{{modelName}}})
+			if string(json{{{modelName}}}) == "{}" { // empty struct
+				dst.{{{modelName}}} = nil
+			} else {
+				return nil // data stored in dst.{{{modelName}}}, return on the first match
+			}
+		} else {
+			dst.{{{modelName}}} = nil
+		}
+	}
 
-    {{/mappedModels}}
-    {{/discriminator}}
-    {{/useOneOfDiscriminatorLookup}}
+	{{/mappedModels}}
+	{{/discriminator}}
+	{{/useOneOfDiscriminatorLookup}}
 	{{#oneOf}}
 	// try to unmarshal data into {{{.}}}
-	err = json.Unmarshal(data, &dst.{{{.}}});
+	err = json.Unmarshal(data, &dst.{{{.}}})
 	if err == nil {
 		json{{{.}}}, _ := json.Marshal(dst.{{{.}}})
 		if string(json{{{.}}}) == "{}" { // empty struct
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
index 416ae81c718..d9c7a0b3b41 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit.go
@@ -36,7 +36,7 @@ func (dst *Fruit) UnmarshalJSON(data []byte) error {
 	var err error
 	match := 0
 	// try to unmarshal data into Apple
-	err = json.Unmarshal(data, &dst.Apple);
+	err = json.Unmarshal(data, &dst.Apple)
 	if err == nil {
 		jsonApple, _ := json.Marshal(dst.Apple)
 		if string(jsonApple) == "{}" { // empty struct
@@ -49,7 +49,7 @@ func (dst *Fruit) UnmarshalJSON(data []byte) error {
 	}
 
 	// try to unmarshal data into Banana
-	err = json.Unmarshal(data, &dst.Banana);
+	err = json.Unmarshal(data, &dst.Banana)
 	if err == nil {
 		jsonBanana, _ := json.Marshal(dst.Banana)
 		if string(jsonBanana) == "{}" { // empty struct
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
index dce03284f0f..d20957648c6 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_fruit_req.go
@@ -36,7 +36,7 @@ func (dst *FruitReq) UnmarshalJSON(data []byte) error {
 	var err error
 	match := 0
 	// try to unmarshal data into AppleReq
-	err = json.Unmarshal(data, &dst.AppleReq);
+	err = json.Unmarshal(data, &dst.AppleReq)
 	if err == nil {
 		jsonAppleReq, _ := json.Marshal(dst.AppleReq)
 		if string(jsonAppleReq) == "{}" { // empty struct
@@ -49,7 +49,7 @@ func (dst *FruitReq) UnmarshalJSON(data []byte) error {
 	}
 
 	// try to unmarshal data into BananaReq
-	err = json.Unmarshal(data, &dst.BananaReq);
+	err = json.Unmarshal(data, &dst.BananaReq)
 	if err == nil {
 		jsonBananaReq, _ := json.Marshal(dst.BananaReq)
 		if string(jsonBananaReq) == "{}" { // empty struct
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
index e9731f1d550..49d5dfdfe2a 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mammal.go
@@ -36,7 +36,7 @@ func (dst *Mammal) UnmarshalJSON(data []byte) error {
 	var err error
 	match := 0
 	// try to unmarshal data into Whale
-	err = json.Unmarshal(data, &dst.Whale);
+	err = json.Unmarshal(data, &dst.Whale)
 	if err == nil {
 		jsonWhale, _ := json.Marshal(dst.Whale)
 		if string(jsonWhale) == "{}" { // empty struct
@@ -49,7 +49,7 @@ func (dst *Mammal) UnmarshalJSON(data []byte) error {
 	}
 
 	// try to unmarshal data into Zebra
-	err = json.Unmarshal(data, &dst.Zebra);
+	err = json.Unmarshal(data, &dst.Zebra)
 	if err == nil {
 		jsonZebra, _ := json.Marshal(dst.Zebra)
 		if string(jsonZebra) == "{}" { // empty struct

From e2e3405689e5fab0bf4e5545fdc8f0a393cb7b9d Mon Sep 17 00:00:00 2001
From: Dennis Melzer <dennis.melzer@de.bosch.com>
Date: Wed, 3 Jun 2020 09:36:19 +0200
Subject: [PATCH 08/22] Register OAuth2ClientContext as bean (#6172)

* Register OAuth2ClientContext as bean

#6171

* Add tab

#6171

* Modify tests

#6171

* Add import for test

#6171

* Modify spring cloud async test

#6171
---
 .../spring-cloud/clientConfiguration.mustache         | 11 +++++++++--
 .../configuration/ClientConfiguration.java            | 11 +++++++++--
 .../configuration/ClientConfiguration.java            | 11 +++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
index c1feeb51599..3d0ccc7d2c5 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/clientConfiguration.mustache
@@ -23,6 +23,7 @@ import org.springframework.context.annotation.Configuration;
 {{#isOAuth}}
 import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
 {{#isApplication}}
 import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsResourceDetails;
 {{/isApplication}}
@@ -71,8 +72,14 @@ public class ClientConfiguration {
     {{#isOAuth}}
   @Bean
   @ConditionalOnProperty("{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.client-id")
-  public OAuth2FeignRequestInterceptor {{{name}}}RequestInterceptor() {
-    return new OAuth2FeignRequestInterceptor(new DefaultOAuth2ClientContext(), {{{name}}}ResourceDetails());
+  public OAuth2FeignRequestInterceptor {{{name}}}RequestInterceptor(OAuth2ClientContext oAuth2ClientContext) {
+    return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, {{{name}}}ResourceDetails());
+  }
+
+  @Bean
+  @ConditionalOnProperty("{{#lambda.lowercase}}{{{title}}}{{/lambda.lowercase}}.security.{{{name}}}.client-id")
+  public OAuth2ClientContext oAuth2ClientContext() {
+    return new DefaultOAuth2ClientContext();
   }
 
         {{#isCode}}
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java
index ae8ce0ea3f6..8f503c9cf22 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -8,6 +8,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
 
 @Configuration
@@ -25,8 +26,14 @@ public class ClientConfiguration {
 
   @Bean
   @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
-  public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor() {
-    return new OAuth2FeignRequestInterceptor(new DefaultOAuth2ClientContext(), petstoreAuthResourceDetails());
+  public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor(OAuth2ClientContext oAuth2ClientContext) {
+    return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, petstoreAuthResourceDetails());
+  }
+
+  @Bean
+  @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
+  public OAuth2ClientContext oAuth2ClientContext() {
+    return new DefaultOAuth2ClientContext();
   }
 
   @Bean
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java
index ae8ce0ea3f6..8f503c9cf22 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/configuration/ClientConfiguration.java
@@ -8,6 +8,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.cloud.security.oauth2.client.feign.OAuth2FeignRequestInterceptor;
 import org.springframework.security.oauth2.client.DefaultOAuth2ClientContext;
+import org.springframework.security.oauth2.client.OAuth2ClientContext;
 import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitResourceDetails;
 
 @Configuration
@@ -25,8 +26,14 @@ public class ClientConfiguration {
 
   @Bean
   @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
-  public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor() {
-    return new OAuth2FeignRequestInterceptor(new DefaultOAuth2ClientContext(), petstoreAuthResourceDetails());
+  public OAuth2FeignRequestInterceptor petstoreAuthRequestInterceptor(OAuth2ClientContext oAuth2ClientContext) {
+    return new OAuth2FeignRequestInterceptor(oAuth2ClientContext, petstoreAuthResourceDetails());
+  }
+
+  @Bean
+  @ConditionalOnProperty("openapipetstore.security.petstoreAuth.client-id")
+  public OAuth2ClientContext oAuth2ClientContext() {
+    return new DefaultOAuth2ClientContext();
   }
 
   @Bean

From d07f459ce35d3eaf54330e3d5e356a92ee32bfe1 Mon Sep 17 00:00:00 2001
From: Jiri Kuncar <jiri.kuncar@gmail.com>
Date: Thu, 4 Jun 2020 03:26:30 +0200
Subject: [PATCH 09/22] [python] Fix date-time parsing (#6458)

---
 .../languages/PythonClientCodegen.java        |  2 +-
 .../PythonClientExperimentalCodegen.java      | 41 ++++++++++---------
 .../python/PythonClientExperimentalTest.java  | 12 ++++++
 ...odels-for-testing-with-http-signature.yaml | 14 ++++++-
 .../python-experimental/docs/InlineObject3.md |  2 +-
 .../petstore_api/model/inline_object3.py      |  2 +-
 6 files changed, 49 insertions(+), 24 deletions(-)

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 5c0df0ab817..dffc0c62a19 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
@@ -722,7 +722,7 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig
         }
 
         // correct "&#39;"s into "'"s after toString()
-        if (ModelUtils.isStringSchema(schema) && schema.getDefault() != null) {
+        if (ModelUtils.isStringSchema(schema) && schema.getDefault() != null && !ModelUtils.isDateSchema(schema) && !ModelUtils.isDateTimeSchema(schema)) {
             example = (String) schema.getDefault();
         }
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
index 38496001238..6096b444ca3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
@@ -38,8 +38,9 @@ import org.openapitools.codegen.meta.Stability;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.io.File;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -196,15 +197,15 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
         return "python-experimental";
     }
 
-    public String dateToString(Schema p, Date date, DateFormat dateFormatter, DateFormat dateTimeFormatter) {
+    public String dateToString(Schema p, OffsetDateTime date, DateTimeFormatter dateFormatter, DateTimeFormatter dateTimeFormatter) {
         // converts a date into a date or date-time python string
         if (!(ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p))) {
             throw new RuntimeException("passed schema must be of type Date or DateTime");
         }
         if (ModelUtils.isDateSchema(p)) {
-            return "dateutil_parser('" + dateFormatter.format(date) + "').date()";
+            return "dateutil_parser('" + date.format(dateFormatter) + "').date()";
         }
-        return "dateutil_parser('" + dateTimeFormatter.format(date) + "')";
+        return "dateutil_parser('" + date.format(dateTimeFormatter) + "')";
     }
 
     /**
@@ -228,20 +229,17 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
         }
 
         // convert datetime and date enums if they exist
-        DateFormat iso8601Date = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT);
-        DateFormat iso8601DateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ROOT);
-        TimeZone utc = TimeZone.getTimeZone("UTC");
-        iso8601Date.setTimeZone(utc);
-        iso8601DateTime.setTimeZone(utc);
+        DateTimeFormatter iso8601Date = DateTimeFormatter.ISO_DATE;
+        DateTimeFormatter iso8601DateTime = DateTimeFormatter.ISO_DATE_TIME;
 
         if (ModelUtils.isDateSchema(p) || ModelUtils.isDateTimeSchema(p)) {
             List<Object> currentEnum = p.getEnum();
             List<String> fixedEnum = new ArrayList<String>();
             String fixedValue = null;
-            Date date = null;
+            OffsetDateTime date = null;
             if (currentEnum != null && !currentEnum.isEmpty()) {
                 for (Object enumItem : currentEnum) {
-                    date = (Date) enumItem;
+                    date = (OffsetDateTime) enumItem;
                     fixedValue = dateToString(p, date, iso8601Date, iso8601DateTime);
                     fixedEnum.add(fixedValue);
                 }
@@ -251,15 +249,21 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
             // convert the example if it exists
             Object currentExample = p.getExample();
             if (currentExample != null) {
-                date = (Date) currentExample;
+                try {
+                    date = (OffsetDateTime) currentExample;
+                } catch (ClassCastException e) {
+                    date = ((Date) currentExample).toInstant().atOffset(ZoneOffset.UTC);
+                    LOGGER.warn("Invalid `date-time` format for value {}", currentExample);
+                }
                 fixedValue = dateToString(p, date, iso8601Date, iso8601DateTime);
                 fixedEnum.add(fixedValue);
                 p.setExample(fixedValue);
+                LOGGER.warn(fixedValue);
             }
 
             // fix defaultObject
             if (defaultObject != null) {
-                date = (Date) defaultObject;
+                date = (OffsetDateTime) defaultObject;
                 fixedValue = dateToString(p, date, iso8601Date, iso8601DateTime);
                 p.setDefault(fixedValue);
                 defaultObject = fixedValue;
@@ -377,7 +381,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
 
     /**
      * Override with special post-processing for all models.
-     */ 
+     */
     @SuppressWarnings({"static-method", "unchecked"})
     public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
         // loop through all models and delete ones where type!=object and the model has no validations and enums
@@ -905,7 +909,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
      * Primitive types in the OAS specification are implemented in Python using the corresponding
      * Python primitive types.
      * Composed types (e.g. allAll, oneOf, anyOf) are represented in Python using list of types.
-     * 
+     *
      * The caller should set the prefix and suffix arguments to empty string, except when
      * getTypeString invokes itself recursively. A non-empty prefix/suffix may be specified
      * to wrap the return value in a python dict, list or tuple.
@@ -913,7 +917,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
      * Examples:
      * - "bool, date, float"  The data must be a bool, date or float.
      * - "[bool, date]"       The data must be an array, and the array items must be a bool or date.
-     * 
+     *
      * @param p The OAS schema.
      * @param prefix prepended to the returned value.
      * @param suffix appended to the returned value.
@@ -922,7 +926,6 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
      * @return a comma-separated string representation of the Python types
      */
     private String getTypeString(Schema p, String prefix, String suffix, List<String> referencedModelNames) {
-        // this is used to set dataType, which defines a python tuple of classes
         String fullSuffix = suffix;
         if (")".equals(suffix)) {
             fullSuffix = "," + suffix;
@@ -968,7 +971,7 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
             } else {
                 return prefix + getTypeString(inner, "[", "]", referencedModelNames) + fullSuffix;
             }
-        } 
+        }
         if (ModelUtils.isFileSchema(p)) {
             return prefix + "file_type" + fullSuffix;
         }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
index c7988952b7f..8ad4990a554 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
@@ -21,8 +21,10 @@ import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.media.*;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
+import java.time.OffsetDateTime;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.languages.PythonClientExperimentalCodegen;
+import org.openapitools.codegen.utils.ModelUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -293,4 +295,14 @@ public class PythonClientExperimentalTest {
         Assert.assertEquals(cm.imports.size(), 0);
     }
 
+    @Test(description = "parse date and date-time example value")
+    public void parseDateAndDateTimeExamplesTest() {
+        final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml");
+        final DefaultCodegen codegen = new PythonClientExperimentalCodegen();
+
+        Schema modelSchema = ModelUtils.getSchema(openAPI, "DateTimeTest");
+        String defaultValue = codegen.toDefaultValue(modelSchema);
+        Assert.assertEquals(defaultValue, "dateutil_parser('2010-01-01T10:10:10.000111+01:00')");
+    }
+
 }
diff --git a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 6fb6d09416e..c9bf37fe1a1 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -758,6 +758,8 @@ paths:
                   description: None
                   type: string
                   format: date-time
+                  default: '2010-02-01T10:20:10.11111+01:00'
+                  example: '2020-02-02T20:20:20.22222Z'
                 password:
                   description: None
                   type: string
@@ -1202,6 +1204,7 @@ components:
         shipDate:
           type: string
           format: date-time
+          example: '2020-02-02T20:20:20.000222Z'
         status:
           type: string
           description: Order Status
@@ -1443,7 +1446,7 @@ components:
           maximum: 543.2
           minimum: 32.1
           type: number
-          multipleOf: 32.5 
+          multipleOf: 32.5
         float:
           type: number
           format: float
@@ -1466,9 +1469,11 @@ components:
         date:
           type: string
           format: date
+          example: '2020-02-02'
         dateTime:
           type: string
           format: date-time
+          example: '2007-12-03T10:15:30+01:00'
         uuid:
           type: string
           format: uuid
@@ -1969,7 +1974,7 @@ components:
         # Here the additional properties are specified using a referenced schema.
         # This is just to validate the generated code works when using $ref
         # under 'additionalProperties'.
-        $ref: '#/components/schemas/fruit' 
+        $ref: '#/components/schemas/fruit'
     Shape:
       oneOf:
         - $ref: '#/components/schemas/Triangle'
@@ -2069,3 +2074,8 @@ components:
           properties:
             name:
               type: string
+    DateTimeTest:
+      type: string
+      default: '2010-01-01T10:10:10.000111+01:00'
+      example: '2010-01-01T10:10:10.000111+01:00'
+      format: date-time
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md
index 050d635dd25..69815c5e63c 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/InlineObject3.md
@@ -14,7 +14,7 @@ Name | Type | Description | Notes
 **string** | **str** | None | [optional] 
 **binary** | **file_type** | None | [optional] 
 **date** | **date** | None | [optional] 
-**date_time** | **datetime** | None | [optional] 
+**date_time** | **datetime** | None | [optional]  if omitted the server will use the default value of dateutil_parser('2010-02-01T10:20:10.11111+01:00')
 **password** | **str** | None | [optional] 
 **callback** | **str** | None | [optional] 
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_object3.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_object3.py
index ff595ddaa1f..01c49c375e7 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_object3.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/inline_object3.py
@@ -210,7 +210,7 @@ class InlineObject3(ModelNormal):
             string (str): None. [optional]  # noqa: E501
             binary (file_type): None. [optional]  # noqa: E501
             date (date): None. [optional]  # noqa: E501
-            date_time (datetime): None. [optional]  # noqa: E501
+            date_time (datetime): None. [optional] if omitted the server will use the default value of dateutil_parser('2010-02-01T10:20:10.11111+01:00')  # noqa: E501
             password (str): None. [optional]  # noqa: E501
             callback (str): None. [optional]  # noqa: E501
         """

From 244683d46a28db37dc9bc17a74f4cf061ee35ad9 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Wed, 3 Jun 2020 21:28:25 -0400
Subject: [PATCH 10/22] [samples] regenerate (#6533)

---
 .../petstore/java/jersey2-java8/.gitignore    |   21 -
 .../jersey2-java8/.openapi-generator-ignore   |   23 -
 .../petstore/java/jersey2-java8/.travis.yml   |   22 -
 .../petstore/java/jersey2-java8/build.gradle  |  125 --
 .../petstore/java/jersey2-java8/build.sbt     |   25 -
 .../petstore/java/jersey2-java8/git_push.sh   |   58 -
 .../java/jersey2-java8/gradle.properties      |    2 -
 .../petstore/java/jersey2-java8/gradlew       |  183 ---
 .../petstore/java/jersey2-java8/gradlew.bat   |  100 --
 .../petstore/java/jersey2-java8/pom.xml       |  305 ----
 .../java/jersey2-java8/settings.gradle        |    1 -
 .../src/main/AndroidManifest.xml              |    3 -
 .../org/openapitools/client/ApiClient.java    | 1287 -----------------
 .../org/openapitools/client/ApiException.java |   94 --
 .../org/openapitools/client/ApiResponse.java  |   74 -
 .../openapitools/client/Configuration.java    |   39 -
 .../java/org/openapitools/client/JSON.java    |   49 -
 .../java/org/openapitools/client/Pair.java    |   61 -
 .../client/RFC3339DateFormat.java             |   32 -
 .../client/ServerConfiguration.java           |   58 -
 .../openapitools/client/ServerVariable.java   |   23 -
 .../org/openapitools/client/StringUtil.java   |   83 --
 .../client/api/AnotherFakeApi.java            |  115 --
 .../openapitools/client/api/DefaultApi.java   |  108 --
 .../org/openapitools/client/api/FakeApi.java  | 1196 ---------------
 .../client/api/FakeClassnameTags123Api.java   |  115 --
 .../org/openapitools/client/api/PetApi.java   |  697 ---------
 .../org/openapitools/client/api/StoreApi.java |  316 ----
 .../org/openapitools/client/api/UserApi.java  |  588 --------
 .../openapitools/client/auth/ApiKeyAuth.java  |   79 -
 .../client/auth/Authentication.java           |   33 -
 .../client/auth/HttpBasicAuth.java            |   56 -
 .../client/auth/HttpBearerAuth.java           |   62 -
 .../client/auth/HttpSignatureAuth.java        |  265 ----
 .../org/openapitools/client/auth/OAuth.java   |  183 ---
 .../openapitools/client/auth/OAuthFlow.java   |   18 -
 .../client/model/AbstractOpenApiSchema.java   |  127 --
 .../model/AdditionalPropertiesClass.java      |  367 -----
 .../org/openapitools/client/model/Animal.java |  142 --
 .../org/openapitools/client/model/Apple.java  |  133 --
 .../openapitools/client/model/AppleReq.java   |  132 --
 .../model/ArrayOfArrayOfNumberOnly.java       |  113 --
 .../client/model/ArrayOfNumberOnly.java       |  113 --
 .../openapitools/client/model/ArrayTest.java  |  191 ---
 .../org/openapitools/client/model/Banana.java |  103 --
 .../openapitools/client/model/BananaReq.java  |  133 --
 .../openapitools/client/model/BasquePig.java  |  101 --
 .../client/model/Capitalization.java          |  257 ----
 .../org/openapitools/client/model/Cat.java    |  112 --
 .../openapitools/client/model/CatAllOf.java   |  102 --
 .../openapitools/client/model/Category.java   |  132 --
 .../openapitools/client/model/ChildCat.java   |  112 --
 .../client/model/ChildCatAllOf.java           |  102 --
 .../openapitools/client/model/ClassModel.java |  103 --
 .../org/openapitools/client/model/Client.java |  102 --
 .../client/model/ComplexQuadrilateral.java    |  133 --
 .../openapitools/client/model/DanishPig.java  |  101 --
 .../org/openapitools/client/model/Dog.java    |  112 --
 .../openapitools/client/model/DogAllOf.java   |  102 --
 .../openapitools/client/model/Drawing.java    |  226 ---
 .../openapitools/client/model/EnumArrays.java |  213 ---
 .../openapitools/client/model/EnumClass.java  |   60 -
 .../openapitools/client/model/EnumTest.java   |  479 ------
 .../client/model/EquilateralTriangle.java     |  133 --
 .../client/model/FileSchemaTestClass.java     |  143 --
 .../org/openapitools/client/model/Foo.java    |  102 --
 .../openapitools/client/model/FormatTest.java |  547 -------
 .../org/openapitools/client/model/Fruit.java  |  141 --
 .../openapitools/client/model/FruitReq.java   |  141 --
 .../openapitools/client/model/GmFruit.java    |  134 --
 .../client/model/GrandparentAnimal.java       |  111 --
 .../client/model/HasOnlyReadOnly.java         |  115 --
 .../client/model/HealthCheckResult.java       |  116 --
 .../client/model/InlineObject.java            |  133 --
 .../client/model/InlineObject1.java           |  134 --
 .../client/model/InlineObject2.java           |  215 ---
 .../client/model/InlineObject3.java           |  514 -------
 .../client/model/InlineObject4.java           |  131 --
 .../client/model/InlineObject5.java           |  133 --
 .../client/model/InlineResponseDefault.java   |  103 --
 .../client/model/IsoscelesTriangle.java       |  133 --
 .../org/openapitools/client/model/Mammal.java |  165 ---
 .../openapitools/client/model/MapTest.java    |  265 ----
 ...ropertiesAndAdditionalPropertiesClass.java |  178 ---
 .../client/model/Model200Response.java        |  134 --
 .../client/model/ModelApiResponse.java        |  164 ---
 .../client/model/ModelReturn.java             |  103 --
 .../org/openapitools/client/model/Name.java   |  177 ---
 .../client/model/NullableClass.java           |  619 --------
 .../client/model/NullableShape.java           |  142 --
 .../openapitools/client/model/NumberOnly.java |  103 --
 .../org/openapitools/client/model/Order.java  |  295 ----
 .../client/model/OuterComposite.java          |  165 ---
 .../openapitools/client/model/OuterEnum.java  |   60 -
 .../client/model/OuterEnumDefaultValue.java   |   60 -
 .../client/model/OuterEnumInteger.java        |   60 -
 .../model/OuterEnumIntegerDefaultValue.java   |   60 -
 .../openapitools/client/model/ParentPet.java  |   81 --
 .../org/openapitools/client/model/Pet.java    |  309 ----
 .../org/openapitools/client/model/Pig.java    |  142 --
 .../client/model/Quadrilateral.java           |  142 --
 .../client/model/QuadrilateralInterface.java  |  101 --
 .../client/model/ReadOnlyFirst.java           |  124 --
 .../client/model/ScaleneTriangle.java         |  133 --
 .../org/openapitools/client/model/Shape.java  |  142 --
 .../client/model/ShapeInterface.java          |  101 --
 .../client/model/ShapeOrNull.java             |  142 --
 .../client/model/SimpleQuadrilateral.java     |  133 --
 .../client/model/SpecialModelName.java        |  102 --
 .../org/openapitools/client/model/Tag.java    |  133 --
 .../openapitools/client/model/Triangle.java   |  165 ---
 .../client/model/TriangleInterface.java       |  101 --
 .../org/openapitools/client/model/User.java   |  476 ------
 .../org/openapitools/client/model/Whale.java  |  163 ---
 .../org/openapitools/client/model/Zebra.java  |  173 ---
 115 files changed, 19394 deletions(-)
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/.gitignore
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator-ignore
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/.travis.yml
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/git_push.sh
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/gradlew
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/gradlew.bat
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/settings.gradle
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/AndroidManifest.xml
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiResponse.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/RFC3339DateFormat.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerConfiguration.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerVariable.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/Authentication.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
 delete mode 100644 samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java

diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.gitignore b/samples/openapi3/client/petstore/java/jersey2-java8/.gitignore
deleted file mode 100644
index a530464afa1..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/.gitignore
+++ /dev/null
@@ -1,21 +0,0 @@
-*.class
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# exclude jar for gradle wrapper
-!gradle/wrapper/*.jar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-# build files
-**/target
-target
-.gradle
-build
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator-ignore b/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator-ignore
deleted file mode 100644
index 7484ee590a3..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/.openapi-generator-ignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/.travis.yml b/samples/openapi3/client/petstore/java/jersey2-java8/.travis.yml
deleted file mode 100644
index e3bdf2af1be..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Generated by OpenAPI Generator: https://openapi-generator.tech
-#
-# Ref: https://docs.travis-ci.com/user/languages/java/
-#
-language: java
-jdk:
-  - openjdk12
-  - openjdk11
-  - openjdk10
-  - openjdk9
-  - openjdk8
-before_install:
-  # ensure gradlew has proper permission
-  - chmod a+x ./gradlew
-script:
-  # test using maven
-  #- mvn test
-  # test using gradle
-  - gradle test
-  # test using sbt 
-  # - sbt test
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
deleted file mode 100644
index 6c7675d844b..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.gradle
+++ /dev/null
@@ -1,125 +0,0 @@
-apply plugin: 'idea'
-apply plugin: 'eclipse'
-
-group = 'org.openapitools'
-version = '1.0.0'
-
-buildscript {
-    repositories {
-        maven { url "https://repo1.maven.org/maven2" }
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.+'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-    }
-}
-
-repositories {
-    jcenter()
-}
-
-
-if(hasProperty('target') && target == 'android') {
-
-    apply plugin: 'com.android.library'
-    apply plugin: 'com.github.dcendents.android-maven'
-
-    android {
-        compileSdkVersion 25
-        buildToolsVersion '25.0.2'
-        defaultConfig {
-            minSdkVersion 14
-            targetSdkVersion 25
-        }
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
-
-        // Rename the aar correctly
-        libraryVariants.all { variant ->
-            variant.outputs.each { output ->
-                def outputFile = output.outputFile
-                if (outputFile != null && outputFile.name.endsWith('.aar')) {
-                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
-                    output.outputFile = new File(outputFile.parent, fileName)
-                }
-            }
-        }
-
-        dependencies {
-            provided 'javax.annotation:jsr250-api:1.0'
-        }
-    }
-
-    afterEvaluate {
-        android.libraryVariants.all { variant ->
-            def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
-            task.description = "Create jar artifact for ${variant.name}"
-            task.dependsOn variant.javaCompile
-            task.from variant.javaCompile.destinationDir
-            task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-            task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
-            artifacts.add('archives', task);
-        }
-    }
-
-    task sourcesJar(type: Jar) {
-        from android.sourceSets.main.java.srcDirs
-        classifier = 'sources'
-    }
-
-    artifacts {
-        archives sourcesJar
-    }
-
-} else {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'petstore-openapi3-jersey2-java8'
-        }
-    }
-
-    task execute(type:JavaExec) {
-       main = System.getProperty('mainClass')
-       classpath = sourceSets.main.runtimeClasspath
-    }
-}
-
-ext {
-    swagger_annotations_version = "1.5.22"
-    jackson_version = "2.10.3"
-    jackson_databind_version = "2.10.4"
-    jackson_databind_nullable_version = "0.2.1"
-    jersey_version = "2.27"
-    junit_version = "4.13"
-    scribejava_apis_version = "6.9.0"
-    tomitribe_http_signatures_version = "1.3"
-}
-
-dependencies {
-    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
-    compile "com.google.code.findbugs:jsr305:3.0.2"
-    compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
-    compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
-    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
-    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
-    compile "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    compile "com.github.scribejava:scribejava-apis:$scribejava_apis_version"
-    compile "org.tomitribe:tomitribe-http-signatures:$tomitribe_http_signatures_version"
-    testCompile "junit:junit:$junit_version"
-}
-
-javadoc {
-    options.tags = [ "http.response.details:a:Http Response Details" ]
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt b/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
deleted file mode 100644
index f83f373eda2..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/build.sbt
+++ /dev/null
@@ -1,25 +0,0 @@
-lazy val root = (project in file(".")).
-  settings(
-    organization := "org.openapitools",
-    name := "petstore-openapi3-jersey2-java8",
-    version := "1.0.0",
-    scalaVersion := "2.11.4",
-    scalacOptions ++= Seq("-feature"),
-    javacOptions in compile ++= Seq("-Xlint:deprecation"),
-    publishArtifact in (Compile, packageDoc) := false,
-    resolvers += Resolver.mavenLocal,
-    libraryDependencies ++= Seq(
-      "io.swagger" % "swagger-annotations" % "1.5.22",
-      "org.glassfish.jersey.core" % "jersey-client" % "2.25.1",
-      "org.glassfish.jersey.media" % "jersey-media-multipart" % "2.25.1",
-      "org.glassfish.jersey.media" % "jersey-media-json-jackson" % "2.25.1",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.10.4" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
-      "com.github.scribejava" % "scribejava-apis" % "6.9.0" % "compile",
-      "org.tomitribe" % "tomitribe-http-signatures" % "1.3" % "compile",
-      "junit" % "junit" % "4.13" % "test",
-      "com.novocode" % "junit-interface" % "0.10" % "test"
-    )
-  )
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/git_push.sh b/samples/openapi3/client/petstore/java/jersey2-java8/git_push.sh
deleted file mode 100644
index ced3be2b0c7..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/git_push.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
-#
-# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
-
-git_user_id=$1
-git_repo_id=$2
-release_note=$3
-git_host=$4
-
-if [ "$git_host" = "" ]; then
-    git_host="github.com"
-    echo "[INFO] No command line input provided. Set \$git_host to $git_host"
-fi
-
-if [ "$git_user_id" = "" ]; then
-    git_user_id="GIT_USER_ID"
-    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
-fi
-
-if [ "$git_repo_id" = "" ]; then
-    git_repo_id="GIT_REPO_ID"
-    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
-fi
-
-if [ "$release_note" = "" ]; then
-    release_note="Minor update"
-    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
-fi
-
-# Initialize the local directory as a Git repository
-git init
-
-# Adds the files in the local repository and stages them for commit.
-git add .
-
-# Commits the tracked changes and prepares them to be pushed to a remote repository.
-git commit -m "$release_note"
-
-# Sets the new remote
-git_remote=`git remote`
-if [ "$git_remote" = "" ]; then # git remote not defined
-
-    if [ "$GIT_TOKEN" = "" ]; then
-        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
-        git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
-    else
-        git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
-    fi
-
-fi
-
-git pull origin master
-
-# Pushes (Forces) the changes in the local repository up to the remote repository
-echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
-git push origin master 2>&1 | grep -v 'To https'
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties b/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
deleted file mode 100644
index 05644f0754a..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Uncomment to build for Android
-#target = android
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/gradlew b/samples/openapi3/client/petstore/java/jersey2-java8/gradlew
deleted file mode 100644
index 2fe81a7d95e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/gradlew
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/gradlew.bat b/samples/openapi3/client/petstore/java/jersey2-java8/gradlew.bat
deleted file mode 100644
index 9618d8d9607..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/gradlew.bat
+++ /dev/null
@@ -1,100 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml b/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
deleted file mode 100644
index 9652f6687d4..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/pom.xml
+++ /dev/null
@@ -1,305 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openapitools</groupId>
-    <artifactId>petstore-openapi3-jersey2-java8</artifactId>
-    <packaging>jar</packaging>
-    <name>petstore-openapi3-jersey2-java8</name>
-    <version>1.0.0</version>
-    <url>https://github.com/openapitools/openapi-generator</url>
-    <description>OpenAPI Java</description>
-    <scm>
-        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
-        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
-        <url>https://github.com/openapitools/openapi-generator</url>
-    </scm>
-
-    <licenses>
-        <license>
-            <name>Unlicense</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.html</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-
-    <developers>
-        <developer>
-            <name>OpenAPI-Generator Contributors</name>
-            <email>team@openapitools.org</email>
-            <organization>OpenAPITools.org</organization>
-            <organizationUrl>http://openapitools.org</organizationUrl>
-        </developer>
-    </developers>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <version>3.0.0-M1</version>
-                <executions>
-                    <execution>
-                        <id>enforce-maven</id>
-                        <goals>
-                            <goal>enforce</goal>
-                        </goals>
-                        <configuration>
-                            <rules>
-                                <requireMavenVersion>
-                                    <version>2.2.0</version>
-                                </requireMavenVersion>
-                            </rules>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M4</version>
-                <configuration>
-                    <systemProperties>
-                        <property>
-                            <name>loggerPath</name>
-                            <value>conf/log4j.properties</value>
-                        </property>
-                    </systemProperties>
-                    <argLine>-Xms512m -Xmx1500m</argLine>
-                    <parallel>methods</parallel>
-                    <threadCount>10</threadCount>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- attach test jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>jar</goal>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>add_sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/main/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>add_test_sources</id>
-                        <phase>generate-test-sources</phase>
-                        <goals>
-                            <goal>add-test-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>src/test/java</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
-                <configuration>
-                        <source>1.8</source>
-                        <target>1.8</target>
-                    <fork>true</fork>
-                    <meminitial>128m</meminitial>
-                    <maxmem>512m</maxmem>
-                    <compilerArgs>
-                        <arg>-Xlint:all</arg>
-                        <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
-                    </compilerArgs>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <doclint>none</doclint>
-                    <tags>
-                        <tag>
-                            <name>http.response.details</name>
-                            <placement>a</placement>
-                            <head>Http Response Details:</head>
-                        </tag>
-                    </tags>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.2.1</version>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar-no-fork</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>sign-artifacts</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
-    <dependencies>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-        
-        <!-- HTTP client: jersey-client -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.inject</groupId>
-            <artifactId>jersey-hk2</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-multipart</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-
-        <!-- JSON processing: jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openapitools</groupId>
-            <artifactId>jackson-databind-nullable</artifactId>
-            <version>${jackson-databind-nullable-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.tomitribe</groupId>
-            <artifactId>tomitribe-http-signatures</artifactId>
-            <version>${http-signature-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.scribejava</groupId>
-            <artifactId>scribejava-apis</artifactId>
-            <version>${scribejava-apis-version}</version>
-        </dependency>
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-annotations-version>1.6.1</swagger-annotations-version>
-        <jersey-version>2.30.1</jersey-version>
-        <jackson-version>2.10.4</jackson-version>
-        <jackson-databind-version>2.10.4</jackson-databind-version>
-        <jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
-        <junit-version>4.13</junit-version>
-        <http-signature-version>1.4</http-signature-version>
-        <scribejava-apis-version>6.9.0</scribejava-apis-version>
-    </properties>
-</project>
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/settings.gradle b/samples/openapi3/client/petstore/java/jersey2-java8/settings.gradle
deleted file mode 100644
index e3652438a24..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = "petstore-openapi3-jersey2-java8"
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/AndroidManifest.xml b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/AndroidManifest.xml
deleted file mode 100644
index 54fbcb3da1e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<manifest package="org.openapitools.client" xmlns:android="http://schemas.android.com/apk/res/android">
-    <application />
-</manifest>
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
deleted file mode 100644
index 67bb225a52e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java
+++ /dev/null
@@ -1,1287 +0,0 @@
-package org.openapitools.client;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.Form;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import com.github.scribejava.core.model.OAuth2AccessToken;
-import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.client.ClientProperties;
-import org.glassfish.jersey.client.HttpUrlConnectorProvider;
-import org.glassfish.jersey.jackson.JacksonFeature;
-import org.glassfish.jersey.media.multipart.FormDataBodyPart;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.MultiPart;
-import org.glassfish.jersey.media.multipart.MultiPartFeature;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import java.net.URI;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import org.glassfish.jersey.logging.LoggingFeature;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Arrays;
-import java.util.ArrayList;
-import java.util.Date;
-
-import java.net.URLEncoder;
-
-import java.io.File;
-import java.io.UnsupportedEncodingException;
-
-import java.text.DateFormat;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.openapitools.client.auth.Authentication;
-import org.openapitools.client.auth.HttpBasicAuth;
-import org.openapitools.client.auth.HttpBearerAuth;
-import org.openapitools.client.auth.HttpSignatureAuth;
-import org.openapitools.client.auth.ApiKeyAuth;
-import org.openapitools.client.auth.OAuth;
-import org.openapitools.client.model.AbstractOpenApiSchema;
-
-
-public class ApiClient {
-  protected Map<String, String> defaultHeaderMap = new HashMap<String, String>();
-  protected Map<String, String> defaultCookieMap = new HashMap<String, String>();
-  protected String basePath = "http://petstore.swagger.io:80/v2";
-  private static final Logger log = Logger.getLogger(ApiClient.class.getName());
-
-  protected List<ServerConfiguration> servers = new ArrayList<ServerConfiguration>(Arrays.asList(
-    new ServerConfiguration(
-      "http://{server}.swagger.io:{port}/v2",
-      "petstore server",
-      new HashMap<String, ServerVariable>() {{
-        put("server", new ServerVariable(
-          "No description provided",
-          "petstore",
-          new HashSet<String>(
-            Arrays.asList(
-              "petstore",
-              "qa-petstore",
-              "dev-petstore"
-            )
-          )
-        ));
-        put("port", new ServerVariable(
-          "No description provided",
-          "80",
-          new HashSet<String>(
-            Arrays.asList(
-              "80",
-              "8080"
-            )
-          )
-        ));
-      }}
-    ),
-    new ServerConfiguration(
-      "https://localhost:8080/{version}",
-      "The local server",
-      new HashMap<String, ServerVariable>() {{
-        put("version", new ServerVariable(
-          "No description provided",
-          "v2",
-          new HashSet<String>(
-            Arrays.asList(
-              "v1",
-              "v2"
-            )
-          )
-        ));
-      }}
-    )
-  ));
-  protected Integer serverIndex = 0;
-  protected Map<String, String> serverVariables = null;
-  protected Map<String, List<ServerConfiguration>> operationServers = new HashMap<String, List<ServerConfiguration>>() {{
-    put("PetApi.addPet", new ArrayList<ServerConfiguration>(Arrays.asList(
-      new ServerConfiguration(
-        "http://petstore.swagger.io/v2",
-        "No description provided",
-        new HashMap<String, ServerVariable>()
-      ),
-
-      new ServerConfiguration(
-        "http://path-server-test.petstore.local/v2",
-        "No description provided",
-        new HashMap<String, ServerVariable>()
-      )
-    )));
-    put("PetApi.updatePet", new ArrayList<ServerConfiguration>(Arrays.asList(
-      new ServerConfiguration(
-        "http://petstore.swagger.io/v2",
-        "No description provided",
-        new HashMap<String, ServerVariable>()
-      ),
-
-      new ServerConfiguration(
-        "http://path-server-test.petstore.local/v2",
-        "No description provided",
-        new HashMap<String, ServerVariable>()
-      )
-    )));
-  }};
-  protected Map<String, Integer> operationServerIndex = new HashMap<String, Integer>();
-  protected Map<String, Map<String, String>> operationServerVariables = new HashMap<String, Map<String, String>>();
-  protected boolean debugging = false;
-  protected int connectionTimeout = 0;
-  private int readTimeout = 0;
-
-  protected Client httpClient;
-  protected JSON json;
-  protected String tempFolderPath = null;
-
-  protected Map<String, Authentication> authentications;
-  protected Map<String, String> authenticationLookup;
-
-  protected DateFormat dateFormat;
-
-  /**
-   * Constructs a new ApiClient with default parameters.
-   */
-  public ApiClient() {
-    this(null);
-  }
-
-  /**
-   * Constructs a new ApiClient with the specified authentication parameters.
-   *
-   * @param authMap A hash map containing authentication parameters.
-   */
-  public ApiClient(Map<String, Authentication> authMap) {
-    json = new JSON();
-    httpClient = buildHttpClient(debugging);
-
-    this.dateFormat = new RFC3339DateFormat();
-
-    // Set default User-Agent.
-    setUserAgent("OpenAPI-Generator/1.0.0/java");
-
-    // Setup authentications (key: authentication name, value: authentication).
-    authentications = new HashMap<String, Authentication>();
-    Authentication auth = null;
-    if (authMap != null) {
-      auth = authMap.get("api_key");
-    }
-    if (auth instanceof ApiKeyAuth) {
-      authentications.put("api_key", auth);
-    } else {
-      authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
-    }
-    if (authMap != null) {
-      auth = authMap.get("api_key_query");
-    }
-    if (auth instanceof ApiKeyAuth) {
-      authentications.put("api_key_query", auth);
-    } else {
-      authentications.put("api_key_query", new ApiKeyAuth("query", "api_key_query"));
-    }
-    if (authMap != null) {
-      auth = authMap.get("bearer_test");
-    }
-    if (auth instanceof HttpBearerAuth) {
-      authentications.put("bearer_test", auth);
-    } else {
-      authentications.put("bearer_test", new HttpBearerAuth("bearer"));
-    }
-    if (authMap != null) {
-      auth = authMap.get("http_basic_test");
-    }
-    if (auth instanceof HttpBasicAuth) {
-      authentications.put("http_basic_test", auth);
-    } else {
-      authentications.put("http_basic_test", new HttpBasicAuth());
-    }
-    if (authMap != null) {
-      auth = authMap.get("http_signature_test");
-    }
-    if (auth instanceof HttpSignatureAuth) {
-      authentications.put("http_signature_test", auth);
-    }
-    if (authMap != null) {
-      auth = authMap.get("petstore_auth");
-    }
-    if (auth instanceof OAuth) {
-      authentications.put("petstore_auth", auth);
-    } else {
-      authentications.put("petstore_auth", new OAuth(basePath, ""));
-    }
-    // Prevent the authentications from being modified.
-    authentications = Collections.unmodifiableMap(authentications);
-
-    // Setup authentication lookup (key: authentication alias, value: authentication name)
-    authenticationLookup = new HashMap<String, String>();
-  }
-
-  /**
-   * Gets the JSON instance to do JSON serialization and deserialization.
-   *
-   * @return JSON
-   */
-  public JSON getJSON() {
-    return json;
-  }
-
-  public Client getHttpClient() {
-    return httpClient;
-  }
-
-  public ApiClient setHttpClient(Client httpClient) {
-    this.httpClient = httpClient;
-    return this;
-  }
-
-  /**
-   * Returns the base URL to the location where the OpenAPI document is being served.
-   *
-   * @return The base URL to the target host.
-   */
-  public String getBasePath() {
-    return basePath;
-  }
-
-  /**
-   * Sets the base URL to the location where the OpenAPI document is being served.
-   *
-   * @param basePath The base URL to the target host.
-   */
-  public ApiClient setBasePath(String basePath) {
-    this.basePath = basePath;
-    setOauthBasePath(basePath);
-    return this;
-  }
-
-  public List<ServerConfiguration> getServers() {
-    return servers;
-  }
-
-  public ApiClient setServers(List<ServerConfiguration> servers) {
-    this.servers = servers;
-    updateBasePath();
-    return this;
-  }
-
-  public Integer getServerIndex() {
-    return serverIndex;
-  }
-
-  public ApiClient setServerIndex(Integer serverIndex) {
-    this.serverIndex = serverIndex;
-    updateBasePath();
-    return this;
-  }
-
-  public Map<String, String> getServerVariables() {
-    return serverVariables;
-  }
-
-  public ApiClient setServerVariables(Map<String, String> serverVariables) {
-    this.serverVariables = serverVariables;
-    updateBasePath();
-    return this;
-  }
-
-  private void updateBasePath() {
-    if (serverIndex != null) {
-        setBasePath(servers.get(serverIndex).URL(serverVariables));
-    }
-  }
-
-  private void setOauthBasePath(String basePath) {
-    for(Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setBasePath(basePath);
-      }
-    }
-  }
-
-  /**
-   * Get authentications (key: authentication name, value: authentication).
-   *
-   * @return Map of authentication object
-   */
-  public Map<String, Authentication> getAuthentications() {
-    return authentications;
-  }
-
-  /**
-   * Get authentication for the given name.
-   *
-   * @param authName The authentication name
-   * @return The authentication, null if not found
-   */
-  public Authentication getAuthentication(String authName) {
-    return authentications.get(authName);
-  }
-
-  /**
-   * Helper method to set username for the first HTTP basic authentication.
-   *
-   * @param username Username
-   */
-  public ApiClient setUsername(String username) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setUsername(username);
-        return this;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set password for the first HTTP basic authentication.
-   *
-   * @param password Password
-   */
-  public ApiClient setPassword(String password) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBasicAuth) {
-        ((HttpBasicAuth) auth).setPassword(password);
-        return this;
-      }
-    }
-    throw new RuntimeException("No HTTP basic authentication configured!");
-  }
-
-  /**
-   * Helper method to set API key value for the first API key authentication.
-   *
-   * @param apiKey API key
-   */
-  public ApiClient setApiKey(String apiKey) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKey(apiKey);
-        return this;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to configure authentications which respects aliases of API keys.
-   *
-   * @param secrets Hash map from authentication name to its secret.
-   */
-  public ApiClient configureApiKeys(HashMap<String, String> secrets) {
-    for (Map.Entry<String, Authentication> authEntry : authentications.entrySet()) {
-      Authentication auth = authEntry.getValue();
-      if (auth instanceof ApiKeyAuth) {
-        String name = authEntry.getKey();
-        // respect x-auth-id-alias property
-        name = authenticationLookup.containsKey(name) ? authenticationLookup.get(name) : name;
-        if (secrets.containsKey(name)) {
-          ((ApiKeyAuth) auth).setApiKey(secrets.get(name));
-        }
-      }
-    }
-    return this;
-  }
-
-  /**
-   * Helper method to set API key prefix for the first API key authentication.
-   *
-   * @param apiKeyPrefix API key prefix
-   */
-  public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof ApiKeyAuth) {
-        ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix);
-        return this;
-      }
-    }
-    throw new RuntimeException("No API key authentication configured!");
-  }
-
-  /**
-   * Helper method to set bearer token for the first Bearer authentication.
-   *
-   * @param bearerToken Bearer token
-   */
-  public ApiClient setBearerToken(String bearerToken) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof HttpBearerAuth) {
-        ((HttpBearerAuth) auth).setBearerToken(bearerToken);
-        return this;
-      }
-    }
-    throw new RuntimeException("No Bearer authentication configured!");
-  }
-
-
-  /**
-   * Helper method to set access token for the first OAuth2 authentication.
-   * @param accessToken Access token
-   */
-  public ApiClient setAccessToken(String accessToken) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setAccessToken(accessToken);
-        return this;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Helper method to set the credentials for the first OAuth2 authentication.
-   *
-   * @param clientId the client ID
-   * @param clientSecret the client secret
-   */
-  public ApiClient setOauthCredentials(String clientId, String clientSecret) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setCredentials(clientId, clientSecret);
-        return this;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Helper method to set the password flow for the first OAuth2 authentication.
-   *
-   * @param username the user name
-   * @param password the user password
-   */
-  public ApiClient setOauthPasswordFlow(String username, String password) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).usePasswordFlow(username, password);
-        return this;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Helper method to set the authorization code flow for the first OAuth2 authentication.
-   *
-   * @param code the authorization code
-   */
-  public ApiClient setOauthAuthorizationCodeFlow(String code) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).useAuthorizationCodeFlow(code);
-        return this;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Helper method to set the scopes for the first OAuth2 authentication.
-   *
-   * @param scope the oauth scope
-   */
-  public ApiClient setOauthScope(String scope) {
-    for (Authentication auth : authentications.values()) {
-      if (auth instanceof OAuth) {
-        ((OAuth) auth).setScope(scope);
-        return this;
-      }
-    }
-    throw new RuntimeException("No OAuth2 authentication configured!");
-  }
-
-  /**
-   * Set the User-Agent header's value (by adding to the default header map).
-   * @param userAgent Http user agent
-   * @return API client
-   */
-  public ApiClient setUserAgent(String userAgent) {
-    addDefaultHeader("User-Agent", userAgent);
-    return this;
-  }
-
-  /**
-   * Add a default header.
-   *
-   * @param key The header's key
-   * @param value The header's value
-   * @return API client
-   */
-  public ApiClient addDefaultHeader(String key, String value) {
-    defaultHeaderMap.put(key, value);
-    return this;
-  }
-
-  /**
-   * Add a default cookie.
-   *
-   * @param key The cookie's key
-   * @param value The cookie's value
-   * @return API client
-   */
-  public ApiClient addDefaultCookie(String key, String value) {
-    defaultCookieMap.put(key, value);
-    return this;
-  }
-
-  /**
-   * Check that whether debugging is enabled for this API client.
-   * @return True if debugging is switched on
-   */
-  public boolean isDebugging() {
-    return debugging;
-  }
-
-  /**
-   * Enable/disable debugging for this API client.
-   *
-   * @param debugging To enable (true) or disable (false) debugging
-   * @return API client
-   */
-  public ApiClient setDebugging(boolean debugging) {
-    this.debugging = debugging;
-    // Rebuild HTTP Client according to the new "debugging" value.
-    this.httpClient = buildHttpClient(debugging);
-    return this;
-  }
-
-  /**
-   * The path of temporary folder used to store downloaded files from endpoints
-   * with file response. The default value is <code>null</code>, i.e. using
-   * the system's default tempopary folder.
-   *
-   * @return Temp folder path
-   */
-  public String getTempFolderPath() {
-    return tempFolderPath;
-  }
-
-  /**
-   * Set temp folder path
-   * @param tempFolderPath Temp folder path
-   * @return API client
-   */
-  public ApiClient setTempFolderPath(String tempFolderPath) {
-    this.tempFolderPath = tempFolderPath;
-    return this;
-  }
-
-  /**
-   * Connect timeout (in milliseconds).
-   * @return Connection timeout
-   */
-  public int getConnectTimeout() {
-    return connectionTimeout;
-  }
-
-  /**
-   * Set the connect timeout (in milliseconds).
-   * A value of 0 means no timeout, otherwise values must be between 1 and
-   * {@link Integer#MAX_VALUE}.
-   * @param connectionTimeout Connection timeout in milliseconds
-   * @return API client
-   */
-  public ApiClient setConnectTimeout(int connectionTimeout) {
-    this.connectionTimeout = connectionTimeout;
-    httpClient.property(ClientProperties.CONNECT_TIMEOUT, connectionTimeout);
-    return this;
-  }
-
-  /**
-   * read timeout (in milliseconds).
-   * @return Read timeout
-   */
-  public int getReadTimeout() {
-    return readTimeout;
-  }
-
-  /**
-   * Set the read timeout (in milliseconds).
-   * A value of 0 means no timeout, otherwise values must be between 1 and
-   * {@link Integer#MAX_VALUE}.
-   * @param readTimeout Read timeout in milliseconds
-   * @return API client
-   */
-  public ApiClient setReadTimeout(int readTimeout) {
-    this.readTimeout = readTimeout;
-    httpClient.property(ClientProperties.READ_TIMEOUT, readTimeout);
-    return this;
-  }
-
-  /**
-   * Get the date format used to parse/format date parameters.
-   * @return Date format
-   */
-  public DateFormat getDateFormat() {
-    return dateFormat;
-  }
-
-  /**
-   * Set the date format used to parse/format date parameters.
-   * @param dateFormat Date format
-   * @return API client
-   */
-  public ApiClient setDateFormat(DateFormat dateFormat) {
-    this.dateFormat = dateFormat;
-    // also set the date format for model (de)serialization with Date properties
-    this.json.setDateFormat((DateFormat) dateFormat.clone());
-    return this;
-  }
-
-  /**
-   * Parse the given string into Date object.
-   * @param str String
-   * @return Date
-   */
-  public Date parseDate(String str) {
-    try {
-      return dateFormat.parse(str);
-    } catch (java.text.ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Format the given Date object into string.
-   * @param date Date
-   * @return Date in string format
-   */
-  public String formatDate(Date date) {
-    return dateFormat.format(date);
-  }
-
-  /**
-   * Format the given parameter object into string.
-   * @param param Object
-   * @return Object in string format
-   */
-  public String parameterToString(Object param) {
-    if (param == null) {
-      return "";
-    } else if (param instanceof Date) {
-      return formatDate((Date) param);
-    } else if (param instanceof Collection) {
-      StringBuilder b = new StringBuilder();
-      for(Object o : (Collection)param) {
-        if(b.length() > 0) {
-          b.append(',');
-        }
-        b.append(String.valueOf(o));
-      }
-      return b.toString();
-    } else {
-      return String.valueOf(param);
-    }
-  }
-
-  /*
-   * Format to {@code Pair} objects.
-   * @param collectionFormat Collection format
-   * @param name Name
-   * @param value Value
-   * @return List of pairs
-   */
-  public List<Pair> parameterToPairs(String collectionFormat, String name, Object value){
-    List<Pair> params = new ArrayList<Pair>();
-
-    // preconditions
-    if (name == null || name.isEmpty() || value == null) return params;
-
-    Collection valueCollection;
-    if (value instanceof Collection) {
-      valueCollection = (Collection) value;
-    } else {
-      params.add(new Pair(name, parameterToString(value)));
-      return params;
-    }
-
-    if (valueCollection.isEmpty()){
-      return params;
-    }
-
-    // get the collection format (default: csv)
-    String format = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat);
-
-    // create the params based on the collection format
-    if ("multi".equals(format)) {
-      for (Object item : valueCollection) {
-        params.add(new Pair(name, parameterToString(item)));
-      }
-
-      return params;
-    }
-
-    String delimiter = ",";
-
-    if ("csv".equals(format)) {
-      delimiter = ",";
-    } else if ("ssv".equals(format)) {
-      delimiter = " ";
-    } else if ("tsv".equals(format)) {
-      delimiter = "\t";
-    } else if ("pipes".equals(format)) {
-      delimiter = "|";
-    }
-
-    StringBuilder sb = new StringBuilder() ;
-    for (Object item : valueCollection) {
-      sb.append(delimiter);
-      sb.append(parameterToString(item));
-    }
-
-    params.add(new Pair(name, sb.substring(1)));
-
-    return params;
-  }
-
-  /**
-   * Check if the given MIME is a JSON MIME.
-   * JSON MIME examples:
-   *   application/json
-   *   application/json; charset=UTF8
-   *   APPLICATION/JSON
-   *   application/vnd.company+json
-   * "* / *" is also default to JSON
-   * @param mime MIME
-   * @return True if the MIME type is JSON
-   */
-  public boolean isJsonMime(String mime) {
-    String jsonMime = "(?i)^(application/json|[^;/ \t]+/[^;/ \t]+[+]json)[ \t]*(;.*)?$";
-    return mime != null && (mime.matches(jsonMime) || mime.equals("*/*"));
-  }
-
-  /**
-   * Select the Accept header's value from the given accepts array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use all of them (joining into a string)
-   *
-   * @param accepts The accepts array to select from
-   * @return The Accept header to use. If the given array is empty,
-   *   null will be returned (not to set the Accept header explicitly).
-   */
-  public String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) {
-      return null;
-    }
-    for (String accept : accepts) {
-      if (isJsonMime(accept)) {
-        return accept;
-      }
-    }
-    return StringUtil.join(accepts, ",");
-  }
-
-  /**
-   * Select the Content-Type header's value from the given array:
-   *   if JSON exists in the given array, use it;
-   *   otherwise use the first one of the array.
-   *
-   * @param contentTypes The Content-Type array to select from
-   * @return The Content-Type header to use. If the given array is empty,
-   *   JSON will be used.
-   */
-  public String selectHeaderContentType(String[] contentTypes) {
-    if (contentTypes.length == 0) {
-      return "application/json";
-    }
-    for (String contentType : contentTypes) {
-      if (isJsonMime(contentType)) {
-        return contentType;
-      }
-    }
-    return contentTypes[0];
-  }
-
-  /**
-   * Escape the given string to be used as URL query value.
-   * @param str String
-   * @return Escaped string
-   */
-  public String escapeString(String str) {
-    try {
-      return URLEncoder.encode(str, "utf8").replaceAll("\\+", "%20");
-    } catch (UnsupportedEncodingException e) {
-      return str;
-    }
-  }
-
-  /**
-   * Serialize the given Java object into string entity according the given
-   * Content-Type (only JSON is supported for now).
-   * @param obj Object
-   * @param formParams Form parameters
-   * @param contentType Context type
-   * @return Entity
-   * @throws ApiException API exception
-   */
-  public Entity<?> serialize(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
-    Entity<?> entity;
-    if (contentType.startsWith("multipart/form-data")) {
-      MultiPart multiPart = new MultiPart();
-      for (Entry<String, Object> param: formParams.entrySet()) {
-        if (param.getValue() instanceof File) {
-          File file = (File) param.getValue();
-          FormDataContentDisposition contentDisp = FormDataContentDisposition.name(param.getKey())
-              .fileName(file.getName()).size(file.length()).build();
-          multiPart.bodyPart(new FormDataBodyPart(contentDisp, file, MediaType.APPLICATION_OCTET_STREAM_TYPE));
-        } else {
-          FormDataContentDisposition contentDisp = FormDataContentDisposition.name(param.getKey()).build();
-          multiPart.bodyPart(new FormDataBodyPart(contentDisp, parameterToString(param.getValue())));
-        }
-      }
-      entity = Entity.entity(multiPart, MediaType.MULTIPART_FORM_DATA_TYPE);
-    } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
-      Form form = new Form();
-      for (Entry<String, Object> param: formParams.entrySet()) {
-        form.param(param.getKey(), parameterToString(param.getValue()));
-      }
-      entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED_TYPE);
-    } else {
-      // We let jersey handle the serialization
-      entity = Entity.entity(obj == null ? Entity.text("") : obj, contentType);
-    }
-    return entity;
-  }
-
-  /**
-   * Serialize the given Java object into string according the given
-   * Content-Type (only JSON, HTTP form is supported for now).
-   * @param obj Object
-   * @param formParams Form parameters
-   * @param contentType Context type
-   * @return String
-   * @throws ApiException API exception
-   */
-  public String serializeToString(Object obj, Map<String, Object> formParams, String contentType) throws ApiException {
-    try {
-      if (contentType.startsWith("multipart/form-data")) {
-        throw new ApiException("multipart/form-data not yet supported for serializeToString (http signature authentication)");
-      } else if (contentType.startsWith("application/x-www-form-urlencoded")) {
-        String formString = "";
-        for (Entry<String, Object> param : formParams.entrySet()) {
-          formString = param.getKey() + "=" + URLEncoder.encode(parameterToString(param.getValue()), "UTF-8") + "&";
-        }
-
-        if (formString.length() == 0) { // empty string
-          return formString;
-        } else {
-          return formString.substring(0, formString.length() - 1);
-        }
-      } else {
-        return json.getMapper().writeValueAsString(obj);
-      }
-    } catch (Exception ex) {
-      throw new ApiException("Failed to perform serializeToString: " + ex.toString());
-    }
-  }
-
-  public AbstractOpenApiSchema deserializeSchemas(Response response, AbstractOpenApiSchema schema) throws ApiException{
-
-    Object result = null;
-    int matchCounter = 0;
-    ArrayList<String> matchSchemas = new ArrayList<>();
-
-    if (schema.isNullable()) {
-      response.bufferEntity();
-      if ("{}".equals(String.valueOf(response.readEntity(String.class))) ||
-          "".equals(String.valueOf(response.readEntity(String.class)))) {
-        // schema is nullable and the response body is {} or empty string
-        return schema;
-      }
-    }
-
-    for (Map.Entry<String, GenericType> entry : schema.getSchemas().entrySet()) {
-      String schemaName = entry.getKey();
-      GenericType schemaType = entry.getValue();
-
-      if (schemaType instanceof GenericType) { // model
-        try {
-          Object deserializedObject = deserialize(response, schemaType);
-          if (deserializedObject != null) {
-            result = deserializedObject;
-            matchCounter++;
-
-            if ("anyOf".equals(schema.getSchemaType())) {
-              break;
-            } else if ("oneOf".equals(schema.getSchemaType())) {
-              matchSchemas.add(schemaName);
-            } else {
-              throw new ApiException("Unknowe type found while expecting anyOf/oneOf:" + schema.getSchemaType());
-            }
-          } else {
-            // failed to deserialize the response in the schema provided, proceed to the next one if any
-          }
-        } catch (Exception ex) {
-          // failed to deserialize, do nothing and try next one (schema)
-          // Logging the error may be useful to troubleshoot why a payload fails to match
-          // the schema.
-          log.log(Level.FINE, "Input data does not match schema '" + schemaName + "'", ex);
-        }
-      } else {// unknown type
-        throw new ApiException(schemaType.getClass() + " is not a GenericType and cannot be handled properly in deserialization.");
-      }
-
-    }
-
-    if (matchCounter > 1 && "oneOf".equals(schema.getSchemaType())) {// more than 1 match for oneOf
-      throw new ApiException("Response body is invalid as it matches more than one schema (" + StringUtil.join(matchSchemas, ", ") + ") defined in the oneOf model: " + schema.getClass().getName());
-    } else if (matchCounter == 0) { // fail to match any in oneOf/anyOf schemas
-      throw new ApiException("Response body is invalid as it does not match any schemas (" + StringUtil.join(schema.getSchemas().keySet(), ", ") + ") defined in the oneOf/anyOf model: " + schema.getClass().getName());
-    } else { // only one matched
-      schema.setActualInstance(result);
-      return schema;
-    }
-
-  }
-
-
-
-  /**
-   * Deserialize response body to Java object according to the Content-Type.
-   * @param <T> Type
-   * @param response Response
-   * @param returnType Return type
-   * @return Deserialize object
-   * @throws ApiException API exception
-   */
-  @SuppressWarnings("unchecked")
-  public <T> T deserialize(Response response, GenericType<T> returnType) throws ApiException {
-    if (response == null || returnType == null) {
-      return null;
-    }
-
-    if ("byte[]".equals(returnType.toString())) {
-      // Handle binary response (byte array).
-      return (T) response.readEntity(byte[].class);
-    } else if (returnType.getRawType() == File.class) {
-      // Handle file downloading.
-      T file = (T) downloadFileFromResponse(response);
-      return file;
-    }
-
-    String contentType = null;
-    List<Object> contentTypes = response.getHeaders().get("Content-Type");
-    if (contentTypes != null && !contentTypes.isEmpty())
-      contentType = String.valueOf(contentTypes.get(0));
-
-    // read the entity stream multiple times
-    response.bufferEntity();
-
-    return response.readEntity(returnType);
-  }
-
-  /**
-   * Download file from the given response.
-   * @param response Response
-   * @return File
-   * @throws ApiException If fail to read file content from response and write to disk
-   */
-  public File downloadFileFromResponse(Response response) throws ApiException {
-    try {
-      File file = prepareDownloadFile(response);
-      Files.copy(response.readEntity(InputStream.class), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
-      return file;
-    } catch (IOException e) {
-      throw new ApiException(e);
-    }
-  }
-
-  public File prepareDownloadFile(Response response) throws IOException {
-    String filename = null;
-    String contentDisposition = (String) response.getHeaders().getFirst("Content-Disposition");
-    if (contentDisposition != null && !"".equals(contentDisposition)) {
-      // Get filename from the Content-Disposition header.
-      Pattern pattern = Pattern.compile("filename=['\"]?([^'\"\\s]+)['\"]?");
-      Matcher matcher = pattern.matcher(contentDisposition);
-      if (matcher.find())
-        filename = matcher.group(1);
-    }
-
-    String prefix;
-    String suffix = null;
-    if (filename == null) {
-      prefix = "download-";
-      suffix = "";
-    } else {
-      int pos = filename.lastIndexOf('.');
-      if (pos == -1) {
-        prefix = filename + "-";
-      } else {
-        prefix = filename.substring(0, pos) + "-";
-        suffix = filename.substring(pos);
-      }
-      // File.createTempFile requires the prefix to be at least three characters long
-      if (prefix.length() < 3)
-        prefix = "download-";
-    }
-
-    if (tempFolderPath == null)
-      return File.createTempFile(prefix, suffix);
-    else
-      return File.createTempFile(prefix, suffix, new File(tempFolderPath));
-  }
-
-  /**
-   * Invoke API by sending HTTP request with the given options.
-   *
-   * @param <T> Type
-   * @param operation The qualified name of the operation
-   * @param path The sub-path of the HTTP URL
-   * @param method The request method, one of "GET", "POST", "PUT", "HEAD" and "DELETE"
-   * @param queryParams The query parameters
-   * @param body The request body object
-   * @param headerParams The header parameters
-   * @param cookieParams The cookie parameters
-   * @param formParams The form parameters
-   * @param accept The request's Accept header
-   * @param contentType The request's Content-Type header
-   * @param authNames The authentications to apply
-   * @param returnType The return type into which to deserialize the response
-   * @param schema An instance of the response that uses oneOf/anyOf
-   * @return The response body in type of string
-   * @throws ApiException API exception
-   */
-  public <T> ApiResponse<T> invokeAPI(
-      String operation,
-      String path,
-      String method,
-      List<Pair> queryParams,
-      Object body,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      Map<String, Object> formParams,
-      String accept,
-      String contentType,
-      String[] authNames,
-      GenericType<T> returnType,
-      AbstractOpenApiSchema schema)
-      throws ApiException {
-
-    // Not using `.target(targetURL).path(path)` below,
-    // to support (constant) query string in `path`, e.g. "/posts?draft=1"
-    String targetURL;
-    if (serverIndex != null && operationServers.containsKey(operation)) {
-      Integer index = operationServerIndex.containsKey(operation) ? operationServerIndex.get(operation) : serverIndex;
-      Map<String, String> variables = operationServerVariables.containsKey(operation) ?
-        operationServerVariables.get(operation) : serverVariables;
-      List<ServerConfiguration> serverConfigurations = operationServers.get(operation);
-      if (index < 0 || index >= serverConfigurations.size()) {
-        throw new ArrayIndexOutOfBoundsException(
-            String.format(
-                "Invalid index %d when selecting the host settings. Must be less than %d",
-                index, serverConfigurations.size()));
-      }
-      targetURL = serverConfigurations.get(index).URL(variables) + path;
-    } else {
-      targetURL = this.basePath + path;
-    }
-    WebTarget target = httpClient.target(targetURL);
-
-    if (queryParams != null) {
-      for (Pair queryParam : queryParams) {
-        if (queryParam.getValue() != null) {
-          target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));
-        }
-      }
-    }
-
-    Invocation.Builder invocationBuilder = target.request().accept(accept);
-
-    for (Entry<String, String> entry : cookieParams.entrySet()) {
-      String value = entry.getValue();
-      if (value != null) {
-        invocationBuilder = invocationBuilder.cookie(entry.getKey(), value);
-      }
-    }
-
-    for (Entry<String, String> entry : defaultCookieMap.entrySet()) {
-      String value = entry.getValue();
-      if (value != null) {
-        invocationBuilder = invocationBuilder.cookie(entry.getKey(), value);
-      }
-    }
-
-    Entity<?> entity = serialize(body, formParams, contentType);
-
-    // put all headers in one place
-    Map<String, String> allHeaderParams = new HashMap<>(defaultHeaderMap);
-    allHeaderParams.putAll(headerParams);
-
-    // update different parameters (e.g. headers) for authentication
-    updateParamsForAuth(
-        authNames,
-        queryParams,
-        allHeaderParams,
-        cookieParams,
-        serializeToString(body, formParams, contentType),
-        method,
-        target.getUri());
-
-    for (Entry<String, String> entry : allHeaderParams.entrySet()) {
-      String value = entry.getValue();
-      if (value != null) {
-        invocationBuilder = invocationBuilder.header(entry.getKey(), value);
-      }
-    }
-
-    Response response = null;
-
-    try {
-      response = sendRequest(method, invocationBuilder, entity);
-
-      // If OAuth is used and a status 401 is received, renew the access token and retry the request
-      if (response.getStatusInfo() == Status.UNAUTHORIZED) {
-        for (String authName : authNames) {
-          Authentication authentication = authentications.get(authName);
-          if (authentication instanceof OAuth) {
-            OAuth2AccessToken accessToken = ((OAuth) authentication).renewAccessToken();
-            if (accessToken != null) {
-              invocationBuilder.header("Authorization", null);
-              invocationBuilder.header("Authorization", "Bearer " + accessToken.getAccessToken());
-              response = sendRequest(method, invocationBuilder, entity);
-            }
-            break;
-          }
-        }
-      }
-
-      int statusCode = response.getStatusInfo().getStatusCode();
-      Map<String, List<String>> responseHeaders = buildResponseHeaders(response);
-
-      if (response.getStatusInfo() == Status.NO_CONTENT) {
-        return new ApiResponse<T>(statusCode, responseHeaders);
-      } else if (response.getStatusInfo().getFamily() == Status.Family.SUCCESSFUL) {
-        if (returnType == null) return new ApiResponse<T>(statusCode, responseHeaders);
-        else if (schema == null) {
-          return new ApiResponse<T>(statusCode, responseHeaders, deserialize(response, returnType));
-        } else { // oneOf/anyOf
-          return new ApiResponse<T>(
-              statusCode, responseHeaders, (T) deserializeSchemas(response, schema));
-        }
-      } else {
-        String message = "error";
-        String respBody = null;
-        if (response.hasEntity()) {
-          try {
-            respBody = String.valueOf(response.readEntity(String.class));
-            message = respBody;
-          } catch (RuntimeException e) {
-            // e.printStackTrace();
-          }
-        }
-        throw new ApiException(
-            response.getStatus(), message, buildResponseHeaders(response), respBody);
-      }
-    } finally {
-      try {
-        response.close();
-      } catch (Exception e) {
-        // it's not critical, since the response object is local in method invokeAPI; that's fine,
-        // just continue
-      }
-    }
-  }
-
-  private Response sendRequest(String method, Invocation.Builder invocationBuilder, Entity<?> entity) {
-    Response response;
-    if ("POST".equals(method)) {
-      response = invocationBuilder.post(entity);
-    } else if ("PUT".equals(method)) {
-      response = invocationBuilder.put(entity);
-    } else if ("DELETE".equals(method)) {
-      response = invocationBuilder.method("DELETE", entity);
-    } else if ("PATCH".equals(method)) {
-      response = invocationBuilder.method("PATCH", entity);
-    } else {
-      response = invocationBuilder.method(method);
-    }
-    return response;
-  }
-
-  /**
-   * @deprecated Add qualified name of the operation as a first parameter.
-   */
-  @Deprecated
-  public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> cookieParams, Map<String, Object> formParams, String accept, String contentType, String[] authNames, GenericType<T> returnType, AbstractOpenApiSchema schema) throws ApiException {
-    return invokeAPI(null, path, method, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames, returnType, schema);
-  }
-
-  /**
-   * Build the Client used to make HTTP requests.
-   * @param debugging Debug setting
-   * @return Client
-   */
-  protected Client buildHttpClient(boolean debugging) {
-    final ClientConfig clientConfig = new ClientConfig();
-    clientConfig.register(MultiPartFeature.class);
-    clientConfig.register(json);
-    clientConfig.register(JacksonFeature.class);
-    clientConfig.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
-    // turn off compliance validation to be able to send payloads with DELETE calls
-    clientConfig.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
-    if (debugging) {
-      clientConfig.register(new LoggingFeature(java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME), java.util.logging.Level.INFO, LoggingFeature.Verbosity.PAYLOAD_ANY, 1024*50 /* Log payloads up to 50K */));
-      clientConfig.property(LoggingFeature.LOGGING_FEATURE_VERBOSITY, LoggingFeature.Verbosity.PAYLOAD_ANY);
-      // Set logger to ALL
-      java.util.logging.Logger.getLogger(LoggingFeature.DEFAULT_LOGGER_NAME).setLevel(java.util.logging.Level.ALL);
-    } else {
-      // suppress warnings for payloads with DELETE calls:
-      java.util.logging.Logger.getLogger("org.glassfish.jersey.client").setLevel(java.util.logging.Level.SEVERE);
-    }
-    performAdditionalClientConfiguration(clientConfig);
-    return ClientBuilder.newClient(clientConfig);
-  }
-
-  protected void performAdditionalClientConfiguration(ClientConfig clientConfig) {
-    // No-op extension point
-  }
-
-  protected Map<String, List<String>> buildResponseHeaders(Response response) {
-    Map<String, List<String>> responseHeaders = new HashMap<String, List<String>>();
-    for (Entry<String, List<Object>> entry: response.getHeaders().entrySet()) {
-      List<Object> values = entry.getValue();
-      List<String> headers = new ArrayList<String>();
-      for (Object o : values) {
-        headers.add(String.valueOf(o));
-      }
-      responseHeaders.put(entry.getKey(), headers);
-    }
-    return responseHeaders;
-  }
-
-  /**
-   * Update query and header parameters based on authentication settings.
-   *
-   * @param authNames The authentications to apply
-   * @param queryParams List of query parameters
-   * @param headerParams Map of header parameters
-   * @param cookieParams Map of cookie parameters
-   * @param method HTTP method (e.g. POST)
-   * @param uri HTTP URI
-   */
-  protected void updateParamsForAuth(String[] authNames, List<Pair> queryParams, Map<String, String> headerParams,
-                                     Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
-    for (String authName : authNames) {
-      Authentication auth = authentications.get(authName);
-      if (auth == null) {
-        continue;
-      }
-      auth.applyToParams(queryParams, headerParams, cookieParams, payload, method, uri);
-    }
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
deleted file mode 100644
index 3612265bc61..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiException.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.client;
-
-import java.util.Map;
-import java.util.List;
-
-/**
- * API Exception
- */
-
-public class ApiException extends Exception {
-    private int code = 0;
-    private Map<String, List<String>> responseHeaders = null;
-    private String responseBody = null;
-
-    public ApiException() {}
-
-    public ApiException(Throwable throwable) {
-        super(throwable);
-    }
-
-    public ApiException(String message) {
-        super(message);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        super(message, throwable);
-        this.code = code;
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    public ApiException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(message, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(String message, Throwable throwable, int code, Map<String, List<String>> responseHeaders) {
-        this(message, throwable, code, responseHeaders, null);
-    }
-
-    public ApiException(int code, Map<String, List<String>> responseHeaders, String responseBody) {
-        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
-    }
-
-    public ApiException(int code, String message) {
-        super(message);
-        this.code = code;
-    }
-
-    public ApiException(int code, String message, Map<String, List<String>> responseHeaders, String responseBody) {
-        this(code, message);
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
-    }
-
-    /**
-     * Get the HTTP status code.
-     *
-     * @return HTTP status code
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /**
-     * Get the HTTP response headers.
-     *
-     * @return A map of list of string
-     */
-    public Map<String, List<String>> getResponseHeaders() {
-        return responseHeaders;
-    }
-
-    /**
-     * Get the HTTP response body.
-     *
-     * @return Response body in the form of string
-     */
-    public String getResponseBody() {
-        return responseBody;
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiResponse.java
deleted file mode 100644
index 5f3daf26600..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiResponse.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.client;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * API response returned by API call.
- *
- * @param <T> The type of data that is deserialized from response body
- */
-public class ApiResponse<T> {
-    private final int statusCode;
-    private final Map<String, List<String>> headers;
-    private final T data;
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers The headers of HTTP response
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers) {
-        this(statusCode, headers, null);
-    }
-
-    /**
-     * @param statusCode The status code of HTTP response
-     * @param headers The headers of HTTP response
-     * @param data The object deserialized from response bod
-     */
-    public ApiResponse(int statusCode, Map<String, List<String>> headers, T data) {
-        this.statusCode = statusCode;
-        this.headers = headers;
-        this.data = data;
-    }
-
-    /**
-     * Get the status code
-     *
-     * @return status code
-     */
-    public int getStatusCode() {
-        return statusCode;
-    }
-
-    /**
-     * Get the headers
-     *
-     * @return map of headers
-     */
-    public Map<String, List<String>> getHeaders() {
-        return headers;
-    }
-
-    /**
-     * Get the data
-     *
-     * @return data
-     */
-    public T getData() {
-        return data;
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
deleted file mode 100644
index acbecda489d..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Configuration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.client;
-
-
-public class Configuration {
-    private static ApiClient defaultApiClient = new ApiClient();
-
-    /**
-     * Get the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @return Default API client
-     */
-    public static ApiClient getDefaultApiClient() {
-        return defaultApiClient;
-    }
-
-    /**
-     * Set the default API client, which would be used when creating API
-     * instances without providing an API client.
-     *
-     * @param apiClient API client
-     */
-    public static void setDefaultApiClient(ApiClient apiClient) {
-        defaultApiClient = apiClient;
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
deleted file mode 100644
index fd834ef6b4a..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.openapitools.client;
-
-import com.fasterxml.jackson.annotation.*;
-import com.fasterxml.jackson.databind.*;
-import org.openapitools.jackson.nullable.JsonNullableModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
-import java.text.DateFormat;
-
-import javax.ws.rs.ext.ContextResolver;
-
-
-public class JSON implements ContextResolver<ObjectMapper> {
-  private ObjectMapper mapper;
-
-  public JSON() {
-    mapper = new ObjectMapper();
-    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true);
-    mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, true);
-    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
-    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
-    mapper.setDateFormat(new RFC3339DateFormat());
-    mapper.registerModule(new JavaTimeModule());
-    JsonNullableModule jnm = new JsonNullableModule();
-    mapper.registerModule(jnm);
-  }
-
-  /**
-   * Set the date format for JSON (de)serialization with Date properties.
-   * @param dateFormat Date format
-   */
-  public void setDateFormat(DateFormat dateFormat) {
-    mapper.setDateFormat(dateFormat);
-  }
-
-  @Override
-  public ObjectMapper getContext(Class<?> type) {
-    return mapper;
-  }
-
-  /**
-   * Get the object mapper
-   *
-   * @return object mapper
-   */
-  public ObjectMapper getMapper() { return mapper; }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
deleted file mode 100644
index ae89aa61454..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/Pair.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.client;
-
-
-public class Pair {
-    private String name = "";
-    private String value = "";
-
-    public Pair (String name, String value) {
-        setName(name);
-        setValue(value);
-    }
-
-    private void setName(String name) {
-        if (!isValidString(name)) {
-            return;
-        }
-
-        this.name = name;
-    }
-
-    private void setValue(String value) {
-        if (!isValidString(value)) {
-            return;
-        }
-
-        this.value = value;
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public String getValue() {
-        return this.value;
-    }
-
-    private boolean isValidString(String arg) {
-        if (arg == null) {
-            return false;
-        }
-
-        if (arg.trim().isEmpty()) {
-            return false;
-        }
-
-        return true;
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/RFC3339DateFormat.java
deleted file mode 100644
index 9509fd08981..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/RFC3339DateFormat.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.client;
-
-import com.fasterxml.jackson.databind.util.ISO8601DateFormat;
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-
-import java.text.FieldPosition;
-import java.util.Date;
-
-
-public class RFC3339DateFormat extends ISO8601DateFormat {
-
-  // Same as ISO8601DateFormat but serializing milliseconds.
-  @Override
-  public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) {
-    String value = ISO8601Utils.format(date, true);
-    toAppendTo.append(value);
-    return toAppendTo;
-  }
-
-}
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerConfiguration.java
deleted file mode 100644
index a1107a8690e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerConfiguration.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.openapitools.client;
-
-import java.util.Map;
-
-/**
- * Representing a Server configuration.
- */
-public class ServerConfiguration {
-    public String URL;
-    public String description;
-    public Map<String, ServerVariable> variables;
-
-    /**
-     * @param URL A URL to the target host.
-     * @param description A describtion of the host designated by the URL.
-     * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template.
-     */
-    public ServerConfiguration(String URL, String description, Map<String, ServerVariable> variables) {
-        this.URL = URL;
-        this.description = description;
-        this.variables = variables;
-    }
-
-    /**
-     * Format URL template using given variables.
-     *
-     * @param variables A map between a variable name and its value.
-     * @return Formatted URL.
-     */
-    public String URL(Map<String, String> variables) {
-        String url = this.URL;
-
-        // go through variables and replace placeholders
-        for (Map.Entry<String, ServerVariable> variable: this.variables.entrySet()) {
-            String name = variable.getKey();
-            ServerVariable serverVariable = variable.getValue();
-            String value = serverVariable.defaultValue;
-
-            if (variables != null && variables.containsKey(name)) {
-                value = variables.get(name);
-                if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) {
-                    throw new RuntimeException("The variable " + name + " in the server URL has invalid value " + value + ".");
-                }
-            }
-            url = url.replaceAll("\\{" + name + "\\}", value);
-        }
-        return url;
-    }
-
-    /**
-     * Format URL template using default server variables.
-     *
-     * @return Formatted URL.
-     */
-    public String URL() {
-        return URL(null);
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerVariable.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerVariable.java
deleted file mode 100644
index c2f13e21666..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ServerVariable.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.openapitools.client;
-
-import java.util.HashSet;
-
-/**
- * Representing a Server Variable for server URL template substitution.
- */
-public class ServerVariable {
-    public String description;
-    public String defaultValue;
-    public HashSet<String> enumValues = null;
-
-    /**
-     * @param description A description for the server variable.
-     * @param defaultValue The default value to use for substitution.
-     * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set.
-     */
-    public ServerVariable(String description, String defaultValue, HashSet<String> enumValues) {
-        this.description = description;
-        this.defaultValue = defaultValue;
-        this.enumValues = enumValues;
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
deleted file mode 100644
index 747a23f5bf2..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/StringUtil.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.client;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-
-public class StringUtil {
-  /**
-   * Check if the given array contains the given value (with case-insensitive comparison).
-   *
-   * @param array The array
-   * @param value The value to search
-   * @return true if the array contains the value
-   */
-  public static boolean containsIgnoreCase(String[] array, String value) {
-    for (String str : array) {
-      if (value == null && str == null) {
-        return true;
-      }
-      if (value != null && value.equalsIgnoreCase(str)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Join an array of strings with the given separator.
-   * <p>
-   * Note: This might be replaced by utility method from commons-lang or guava someday
-   * if one of those libraries is added as dependency.
-   * </p>
-   *
-   * @param array     The array of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(String[] array, String separator) {
-    int len = array.length;
-    if (len == 0) {
-      return "";
-    }
-
-    StringBuilder out = new StringBuilder();
-    out.append(array[0]);
-    for (int i = 1; i < len; i++) {
-      out.append(separator).append(array[i]);
-    }
-    return out.toString();
-  }
-
-  /**
-   * Join a list of strings with the given separator.
-   *
-   * @param list      The list of strings
-   * @param separator The separator
-   * @return the resulting string
-   */
-  public static String join(Collection<String> list, String separator) {
-    Iterator<String> iterator = list.iterator();
-    StringBuilder out = new StringBuilder();
-    if (iterator.hasNext()) {
-      out.append(iterator.next());
-    }
-    while (iterator.hasNext()) {
-      out.append(separator).append(iterator.next());
-    }
-    return out.toString();
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
deleted file mode 100644
index 4d808ec6f5f..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class AnotherFakeApi {
-  private ApiClient apiClient;
-
-  public AnotherFakeApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public AnotherFakeApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param client client model (required)
-   * @return Client
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public Client call123testSpecialTags(Client client) throws ApiException {
-    return call123testSpecialTagsWithHttpInfo(client).getData();
-  }
-
-  /**
-   * To test special tags
-   * To test special tags and operation ID starting with number
-   * @param client client model (required)
-   * @return ApiResponse&lt;Client&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Client> call123testSpecialTagsWithHttpInfo(Client client) throws ApiException {
-    Object localVarPostBody = client;
-    
-    // verify the required parameter 'client' is set
-    if (client == null) {
-      throw new ApiException(400, "Missing the required parameter 'client' when calling call123testSpecialTags");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/another-fake/dummy";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
-
-    return apiClient.invokeAPI("AnotherFakeApi.call123testSpecialTags", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
deleted file mode 100644
index eb269e49f80..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/DefaultApi.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import org.openapitools.client.model.InlineResponseDefault;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class DefaultApi {
-  private ApiClient apiClient;
-
-  public DefaultApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public DefaultApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * 
-   * 
-   * @return InlineResponseDefault
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> response </td><td>  -  </td></tr>
-     </table>
-   */
-  public InlineResponseDefault fooGet() throws ApiException {
-    return fooGetWithHttpInfo().getData();
-  }
-
-  /**
-   * 
-   * 
-   * @return ApiResponse&lt;InlineResponseDefault&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> response </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<InlineResponseDefault> fooGetWithHttpInfo() throws ApiException {
-    Object localVarPostBody = null;
-    
-    // create path and map variables
-    String localVarPath = "/foo";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<InlineResponseDefault> localVarReturnType = new GenericType<InlineResponseDefault>() {};
-
-    return apiClient.invokeAPI("DefaultApi.fooGet", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
deleted file mode 100644
index c57ccaa4157..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ /dev/null
@@ -1,1196 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import java.math.BigDecimal;
-import org.openapitools.client.model.Client;
-import java.io.File;
-import org.openapitools.client.model.FileSchemaTestClass;
-import org.openapitools.client.model.HealthCheckResult;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import org.openapitools.client.model.OuterComposite;
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class FakeApi {
-  private ApiClient apiClient;
-
-  public FakeApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public FakeApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Health check endpoint
-   * 
-   * @return HealthCheckResult
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> The instance started successfully </td><td>  -  </td></tr>
-     </table>
-   */
-  public HealthCheckResult fakeHealthGet() throws ApiException {
-    return fakeHealthGetWithHttpInfo().getData();
-  }
-
-  /**
-   * Health check endpoint
-   * 
-   * @return ApiResponse&lt;HealthCheckResult&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> The instance started successfully </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<HealthCheckResult> fakeHealthGetWithHttpInfo() throws ApiException {
-    Object localVarPostBody = null;
-    
-    // create path and map variables
-    String localVarPath = "/fake/health";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<HealthCheckResult> localVarReturnType = new GenericType<HealthCheckResult>() {};
-
-    return apiClient.invokeAPI("FakeApi.fakeHealthGet", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return Boolean
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
-     </table>
-   */
-  public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException {
-    return fakeOuterBooleanSerializeWithHttpInfo(body).getData();
-  }
-
-  /**
-   * 
-   * Test serialization of outer boolean types
-   * @param body Input boolean as post body (optional)
-   * @return ApiResponse&lt;Boolean&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output boolean </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Boolean> fakeOuterBooleanSerializeWithHttpInfo(Boolean body) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // create path and map variables
-    String localVarPath = "/fake/outer/boolean";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "*/*"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Boolean> localVarReturnType = new GenericType<Boolean>() {};
-
-    return apiClient.invokeAPI("FakeApi.fakeOuterBooleanSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param outerComposite Input composite as post body (optional)
-   * @return OuterComposite
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
-     </table>
-   */
-  public OuterComposite fakeOuterCompositeSerialize(OuterComposite outerComposite) throws ApiException {
-    return fakeOuterCompositeSerializeWithHttpInfo(outerComposite).getData();
-  }
-
-  /**
-   * 
-   * Test serialization of object with outer number type
-   * @param outerComposite Input composite as post body (optional)
-   * @return ApiResponse&lt;OuterComposite&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output composite </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<OuterComposite> fakeOuterCompositeSerializeWithHttpInfo(OuterComposite outerComposite) throws ApiException {
-    Object localVarPostBody = outerComposite;
-    
-    // create path and map variables
-    String localVarPath = "/fake/outer/composite";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "*/*"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<OuterComposite> localVarReturnType = new GenericType<OuterComposite>() {};
-
-    return apiClient.invokeAPI("FakeApi.fakeOuterCompositeSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return BigDecimal
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
-     </table>
-   */
-  public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException {
-    return fakeOuterNumberSerializeWithHttpInfo(body).getData();
-  }
-
-  /**
-   * 
-   * Test serialization of outer number types
-   * @param body Input number as post body (optional)
-   * @return ApiResponse&lt;BigDecimal&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output number </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<BigDecimal> fakeOuterNumberSerializeWithHttpInfo(BigDecimal body) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // create path and map variables
-    String localVarPath = "/fake/outer/number";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "*/*"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<BigDecimal> localVarReturnType = new GenericType<BigDecimal>() {};
-
-    return apiClient.invokeAPI("FakeApi.fakeOuterNumberSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return String
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
-     </table>
-   */
-  public String fakeOuterStringSerialize(String body) throws ApiException {
-    return fakeOuterStringSerializeWithHttpInfo(body).getData();
-  }
-
-  /**
-   * 
-   * Test serialization of outer string types
-   * @param body Input string as post body (optional)
-   * @return ApiResponse&lt;String&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Output string </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<String> fakeOuterStringSerializeWithHttpInfo(String body) throws ApiException {
-    Object localVarPostBody = body;
-    
-    // create path and map variables
-    String localVarPath = "/fake/outer/string";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "*/*"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<String> localVarReturnType = new GenericType<String>() {};
-
-    return apiClient.invokeAPI("FakeApi.fakeOuterStringSerialize", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param fileSchemaTestClass  (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass) throws ApiException {
-    testBodyWithFileSchemaWithHttpInfo(fileSchemaTestClass);
-  }
-
-  /**
-   * 
-   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
-   * @param fileSchemaTestClass  (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testBodyWithFileSchemaWithHttpInfo(FileSchemaTestClass fileSchemaTestClass) throws ApiException {
-    Object localVarPostBody = fileSchemaTestClass;
-    
-    // verify the required parameter 'fileSchemaTestClass' is set
-    if (fileSchemaTestClass == null) {
-      throw new ApiException(400, "Missing the required parameter 'fileSchemaTestClass' when calling testBodyWithFileSchema");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/body-with-file-schema";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testBodyWithFileSchema", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param user  (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testBodyWithQueryParams(String query, User user) throws ApiException {
-    testBodyWithQueryParamsWithHttpInfo(query, user);
-  }
-
-  /**
-   * 
-   * 
-   * @param query  (required)
-   * @param user  (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(String query, User user) throws ApiException {
-    Object localVarPostBody = user;
-    
-    // verify the required parameter 'query' is set
-    if (query == null) {
-      throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams");
-    }
-    
-    // verify the required parameter 'user' is set
-    if (user == null) {
-      throw new ApiException(400, "Missing the required parameter 'user' when calling testBodyWithQueryParams");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/body-with-query-params";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "query", query));
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testBodyWithQueryParams", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param client client model (required)
-   * @return Client
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public Client testClientModel(Client client) throws ApiException {
-    return testClientModelWithHttpInfo(client).getData();
-  }
-
-  /**
-   * To test \&quot;client\&quot; model
-   * To test \&quot;client\&quot; model
-   * @param client client model (required)
-   * @return ApiResponse&lt;Client&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws ApiException {
-    Object localVarPostBody = client;
-    
-    // verify the required parameter 'client' is set
-    if (client == null) {
-      throw new ApiException(400, "Missing the required parameter 'client' when calling testClientModel");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
-
-    return apiClient.invokeAPI("FakeApi.testClientModel", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-  }
-
-  /**
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
-   * @param number None (required)
-   * @param _double None (required)
-   * @param patternWithoutDelimiter None (required)
-   * @param _byte None (required)
-   * @param integer None (optional)
-   * @param int32 None (optional)
-   * @param int64 None (optional)
-   * @param _float None (optional)
-   * @param string None (optional)
-   * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
-   * @param password None (optional)
-   * @param paramCallback None (optional)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'number' is set
-    if (number == null) {
-      throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
-    }
-    
-    // verify the required parameter '_double' is set
-    if (_double == null) {
-      throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters");
-    }
-    
-    // verify the required parameter 'patternWithoutDelimiter' is set
-    if (patternWithoutDelimiter == null) {
-      throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters");
-    }
-    
-    // verify the required parameter '_byte' is set
-    if (_byte == null) {
-      throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    if (integer != null)
-      localVarFormParams.put("integer", integer);
-if (int32 != null)
-      localVarFormParams.put("int32", int32);
-if (int64 != null)
-      localVarFormParams.put("int64", int64);
-if (number != null)
-      localVarFormParams.put("number", number);
-if (_float != null)
-      localVarFormParams.put("float", _float);
-if (_double != null)
-      localVarFormParams.put("double", _double);
-if (string != null)
-      localVarFormParams.put("string", string);
-if (patternWithoutDelimiter != null)
-      localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
-if (_byte != null)
-      localVarFormParams.put("byte", _byte);
-if (binary != null)
-      localVarFormParams.put("binary", binary);
-if (date != null)
-      localVarFormParams.put("date", date);
-if (dateTime != null)
-      localVarFormParams.put("dateTime", dateTime);
-if (password != null)
-      localVarFormParams.put("password", password);
-if (paramCallback != null)
-      localVarFormParams.put("callback", paramCallback);
-
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "http_basic_test" };
-
-    return apiClient.invokeAPI("FakeApi.testEndpointParameters", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
-    testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
-  }
-
-  /**
-   * To test enum parameters
-   * To test enum parameters
-   * @param enumHeaderStringArray Header parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryStringArray Query parameter enum test (string array) (optional, default to new ArrayList&lt;&gt;())
-   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
-   * @param enumQueryInteger Query parameter enum test (double) (optional)
-   * @param enumQueryDouble Query parameter enum test (double) (optional)
-   * @param enumFormStringArray Form parameter enum test (string array) (optional, default to $)
-   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid request </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // create path and map variables
-    String localVarPath = "/fake";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_string", enumQueryString));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_integer", enumQueryInteger));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "enum_query_double", enumQueryDouble));
-
-    if (enumHeaderStringArray != null)
-      localVarHeaderParams.put("enum_header_string_array", apiClient.parameterToString(enumHeaderStringArray));
-if (enumHeaderString != null)
-      localVarHeaderParams.put("enum_header_string", apiClient.parameterToString(enumHeaderString));
-
-    
-    if (enumFormStringArray != null)
-      localVarFormParams.put("enum_form_string_array", enumFormStringArray);
-if (enumFormString != null)
-      localVarFormParams.put("enum_form_string", enumFormString);
-
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testEnumParameters", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-
-private ApiResponse<Void> testGroupParametersWithHttpInfo(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'requiredStringGroup' is set
-    if (requiredStringGroup == null) {
-      throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters");
-    }
-    
-    // verify the required parameter 'requiredBooleanGroup' is set
-    if (requiredBooleanGroup == null) {
-      throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters");
-    }
-    
-    // verify the required parameter 'requiredInt64Group' is set
-    if (requiredInt64Group == null) {
-      throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_string_group", requiredStringGroup));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "required_int64_group", requiredInt64Group));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "string_group", stringGroup));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "int64_group", int64Group));
-
-    if (requiredBooleanGroup != null)
-      localVarHeaderParams.put("required_boolean_group", apiClient.parameterToString(requiredBooleanGroup));
-if (booleanGroup != null)
-      localVarHeaderParams.put("boolean_group", apiClient.parameterToString(booleanGroup));
-
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "bearer_test" };
-
-    return apiClient.invokeAPI("FakeApi.testGroupParameters", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-
-  public class APItestGroupParametersRequest {
-    private Integer requiredStringGroup;
-    private Boolean requiredBooleanGroup;
-    private Long requiredInt64Group;
-    private Integer stringGroup;
-    private Boolean booleanGroup;
-    private Long int64Group;
-
-    private APItestGroupParametersRequest() {
-    }
-
-    /**
-     * Set requiredStringGroup
-     * @param requiredStringGroup Required String in group parameters (required)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest requiredStringGroup(Integer requiredStringGroup) {
-      this.requiredStringGroup = requiredStringGroup;
-      return this;
-    }
-
-    /**
-     * Set requiredBooleanGroup
-     * @param requiredBooleanGroup Required Boolean in group parameters (required)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest requiredBooleanGroup(Boolean requiredBooleanGroup) {
-      this.requiredBooleanGroup = requiredBooleanGroup;
-      return this;
-    }
-
-    /**
-     * Set requiredInt64Group
-     * @param requiredInt64Group Required Integer in group parameters (required)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest requiredInt64Group(Long requiredInt64Group) {
-      this.requiredInt64Group = requiredInt64Group;
-      return this;
-    }
-
-    /**
-     * Set stringGroup
-     * @param stringGroup String in group parameters (optional)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest stringGroup(Integer stringGroup) {
-      this.stringGroup = stringGroup;
-      return this;
-    }
-
-    /**
-     * Set booleanGroup
-     * @param booleanGroup Boolean in group parameters (optional)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest booleanGroup(Boolean booleanGroup) {
-      this.booleanGroup = booleanGroup;
-      return this;
-    }
-
-    /**
-     * Set int64Group
-     * @param int64Group Integer in group parameters (optional)
-     * @return APItestGroupParametersRequest
-     */
-    public APItestGroupParametersRequest int64Group(Long int64Group) {
-      this.int64Group = int64Group;
-      return this;
-    }
-
-    /**
-     * Execute testGroupParameters request
-     
-     * @throws ApiException if fails to make API call
-     * @http.response.details
-       <table summary="Response Details" border="1">
-         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-         <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
-       </table>
-     
-     */
-    
-    public void execute() throws ApiException {
-      this.executeWithHttpInfo().getData();
-    }
-
-    /**
-     * Execute testGroupParameters request with HTTP info returned
-     * @return ApiResponse&lt;Void&gt;
-     * @throws ApiException if fails to make API call
-     * @http.response.details
-       <table summary="Response Details" border="1">
-         <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-         <tr><td> 400 </td><td> Someting wrong </td><td>  -  </td></tr>
-       </table>
-
-     */
-    public ApiResponse<Void> executeWithHttpInfo() throws ApiException {
-      return testGroupParametersWithHttpInfo(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
-    }
-  }
-
-  /**
-   * Fake endpoint to test group parameters (optional)
-   * Fake endpoint to test group parameters (optional)
-   * @return testGroupParametersRequest
-   * @throws ApiException if fails to make API call
-   
-   
-   */
-  public APItestGroupParametersRequest testGroupParameters() throws ApiException {
-    return new APItestGroupParametersRequest();
-  }
-  /**
-   * test inline additionalProperties
-   * 
-   * @param requestBody request body (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testInlineAdditionalProperties(Map<String, String> requestBody) throws ApiException {
-    testInlineAdditionalPropertiesWithHttpInfo(requestBody);
-  }
-
-  /**
-   * test inline additionalProperties
-   * 
-   * @param requestBody request body (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testInlineAdditionalPropertiesWithHttpInfo(Map<String, String> requestBody) throws ApiException {
-    Object localVarPostBody = requestBody;
-    
-    // verify the required parameter 'requestBody' is set
-    if (requestBody == null) {
-      throw new ApiException(400, "Missing the required parameter 'requestBody' when calling testInlineAdditionalProperties");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/inline-additionalProperties";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testInlineAdditionalProperties", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testJsonFormData(String param, String param2) throws ApiException {
-    testJsonFormDataWithHttpInfo(param, param2);
-  }
-
-  /**
-   * test json serialization of form data
-   * 
-   * @param param field1 (required)
-   * @param param2 field2 (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testJsonFormDataWithHttpInfo(String param, String param2) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'param' is set
-    if (param == null) {
-      throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData");
-    }
-    
-    // verify the required parameter 'param2' is set
-    if (param2 == null) {
-      throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/jsonFormData";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    if (param != null)
-      localVarFormParams.put("param", param);
-if (param2 != null)
-      localVarFormParams.put("param2", param2);
-
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testJsonFormData", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public void testQueryParameterCollectionFormat(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
-    testQueryParameterCollectionFormatWithHttpInfo(pipe, ioutil, http, url, context);
-  }
-
-  /**
-   * 
-   * To test the collection format in query parameters
-   * @param pipe  (required)
-   * @param ioutil  (required)
-   * @param http  (required)
-   * @param url  (required)
-   * @param context  (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> Success </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(List<String> pipe, List<String> ioutil, List<String> http, List<String> url, List<String> context) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'pipe' is set
-    if (pipe == null) {
-      throw new ApiException(400, "Missing the required parameter 'pipe' when calling testQueryParameterCollectionFormat");
-    }
-    
-    // verify the required parameter 'ioutil' is set
-    if (ioutil == null) {
-      throw new ApiException(400, "Missing the required parameter 'ioutil' when calling testQueryParameterCollectionFormat");
-    }
-    
-    // verify the required parameter 'http' is set
-    if (http == null) {
-      throw new ApiException(400, "Missing the required parameter 'http' when calling testQueryParameterCollectionFormat");
-    }
-    
-    // verify the required parameter 'url' is set
-    if (url == null) {
-      throw new ApiException(400, "Missing the required parameter 'url' when calling testQueryParameterCollectionFormat");
-    }
-    
-    // verify the required parameter 'context' is set
-    if (context == null) {
-      throw new ApiException(400, "Missing the required parameter 'context' when calling testQueryParameterCollectionFormat");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/test-query-paramters";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "pipe", pipe));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "ioutil", ioutil));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("space", "http", http));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "url", url));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("multi", "context", context));
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("FakeApi.testQueryParameterCollectionFormat", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
deleted file mode 100644
index 339851556a5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import org.openapitools.client.model.Client;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class FakeClassnameTags123Api {
-  private ApiClient apiClient;
-
-  public FakeClassnameTags123Api() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public FakeClassnameTags123Api(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param client client model (required)
-   * @return Client
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public Client testClassname(Client client) throws ApiException {
-    return testClassnameWithHttpInfo(client).getData();
-  }
-
-  /**
-   * To test class name in snake case
-   * To test class name in snake case
-   * @param client client model (required)
-   * @return ApiResponse&lt;Client&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Client> testClassnameWithHttpInfo(Client client) throws ApiException {
-    Object localVarPostBody = client;
-    
-    // verify the required parameter 'client' is set
-    if (client == null) {
-      throw new ApiException(400, "Missing the required parameter 'client' when calling testClassname");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake_classname_test";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "api_key_query" };
-
-    GenericType<Client> localVarReturnType = new GenericType<Client>() {};
-
-    return apiClient.invokeAPI("FakeClassnameTags123Api.testClassname", localVarPath, "PATCH", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
deleted file mode 100644
index d1bd8c6a510..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/PetApi.java
+++ /dev/null
@@ -1,697 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import java.io.File;
-import org.openapitools.client.model.ModelApiResponse;
-import org.openapitools.client.model.Pet;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class PetApi {
-  private ApiClient apiClient;
-
-  public PetApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public PetApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Add a new pet to the store
-   * 
-   * @param pet Pet object that needs to be added to the store (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
-     </table>
-   */
-  public void addPet(Pet pet) throws ApiException {
-    addPetWithHttpInfo(pet);
-  }
-
-  /**
-   * Add a new pet to the store
-   * 
-   * @param pet Pet object that needs to be added to the store (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> addPetWithHttpInfo(Pet pet) throws ApiException {
-    Object localVarPostBody = pet;
-    
-    // verify the required parameter 'pet' is set
-    if (pet == null) {
-      throw new ApiException(400, "Missing the required parameter 'pet' when calling addPet");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json", "application/xml"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "http_signature_test", "petstore_auth" };
-
-    return apiClient.invokeAPI("PetApi.addPet", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
-     </table>
-   */
-  public void deletePet(Long petId, String apiKey) throws ApiException {
-    deletePetWithHttpInfo(petId, apiKey);
-  }
-
-  /**
-   * Deletes a pet
-   * 
-   * @param petId Pet id to delete (required)
-   * @param apiKey  (optional)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid pet value </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> deletePetWithHttpInfo(Long petId, String apiKey) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/{petId}"
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    if (apiKey != null)
-      localVarHeaderParams.put("api_key", apiClient.parameterToString(apiKey));
-
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-
-    return apiClient.invokeAPI("PetApi.deletePet", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * 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 (required)
-   * @return List&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
-     </table>
-   */
-  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
-    return findPetsByStatusWithHttpInfo(status).getData();
-  }
-
-  /**
-   * 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 (required)
-   * @return ApiResponse&lt;List&lt;Pet&gt;&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid status value </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(List<String> status) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'status' is set
-    if (status == null) {
-      throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/findByStatus";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "status", status));
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "http_signature_test", "petstore_auth" };
-
-    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
-
-    return apiClient.invokeAPI("PetApi.findPetsByStatus", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 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 (required)
-   * @return List&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
-     </table>
-   * @deprecated
-   */
-  @Deprecated
-  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
-    return findPetsByTagsWithHttpInfo(tags).getData();
-  }
-
-  /**
-   * 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 (required)
-   * @return ApiResponse&lt;List&lt;Pet&gt;&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid tag value </td><td>  -  </td></tr>
-     </table>
-   * @deprecated
-   */
-  @Deprecated
-  public ApiResponse<List<Pet>> findPetsByTagsWithHttpInfo(List<String> tags) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'tags' is set
-    if (tags == null) {
-      throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/findByTags";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("csv", "tags", tags));
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "http_signature_test", "petstore_auth" };
-
-    GenericType<List<Pet>> localVarReturnType = new GenericType<List<Pet>>() {};
-
-    return apiClient.invokeAPI("PetApi.findPetsByTags", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return Pet
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public Pet getPetById(Long petId) throws ApiException {
-    return getPetByIdWithHttpInfo(petId).getData();
-  }
-
-  /**
-   * Find pet by ID
-   * Returns a single pet
-   * @param petId ID of pet to return (required)
-   * @return ApiResponse&lt;Pet&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Pet> getPetByIdWithHttpInfo(Long petId) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/{petId}"
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "api_key" };
-
-    GenericType<Pet> localVarReturnType = new GenericType<Pet>() {};
-
-    return apiClient.invokeAPI("PetApi.getPetById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Update an existing pet
-   * 
-   * @param pet Pet object that needs to be added to the store (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-       <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
-     </table>
-   */
-  public void updatePet(Pet pet) throws ApiException {
-    updatePetWithHttpInfo(pet);
-  }
-
-  /**
-   * Update an existing pet
-   * 
-   * @param pet Pet object that needs to be added to the store (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Pet not found </td><td>  -  </td></tr>
-       <tr><td> 405 </td><td> Validation exception </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> updatePetWithHttpInfo(Pet pet) throws ApiException {
-    Object localVarPostBody = pet;
-    
-    // verify the required parameter 'pet' is set
-    if (pet == null) {
-      throw new ApiException(400, "Missing the required parameter 'pet' when calling updatePet");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json", "application/xml"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "http_signature_test", "petstore_auth" };
-
-    return apiClient.invokeAPI("PetApi.updatePet", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
-     </table>
-   */
-  public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
-    updatePetWithFormWithHttpInfo(petId, name, status);
-  }
-
-  /**
-   * Updates a pet in the store with form data
-   * 
-   * @param petId ID of pet that needs to be updated (required)
-   * @param name Updated name of the pet (optional)
-   * @param status Updated status of the pet (optional)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 405 </td><td> Invalid input </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> updatePetWithFormWithHttpInfo(Long petId, String name, String status) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/{petId}"
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    if (name != null)
-      localVarFormParams.put("name", name);
-if (status != null)
-      localVarFormParams.put("status", status);
-
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/x-www-form-urlencoded"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-
-    return apiClient.invokeAPI("PetApi.updatePetWithForm", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
-    return uploadFileWithHttpInfo(petId, additionalMetadata, file).getData();
-  }
-
-  /**
-   * uploads an image
-   * 
-   * @param petId ID of pet to update (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @param file file to upload (optional)
-   * @return ApiResponse&lt;ModelApiResponse&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<ModelApiResponse> uploadFileWithHttpInfo(Long petId, String additionalMetadata, File file) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/pet/{petId}/uploadImage"
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    if (additionalMetadata != null)
-      localVarFormParams.put("additionalMetadata", additionalMetadata);
-if (file != null)
-      localVarFormParams.put("file", file);
-
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "multipart/form-data"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-
-    GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
-
-    return apiClient.invokeAPI("PetApi.uploadFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return ModelApiResponse
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
-    return uploadFileWithRequiredFileWithHttpInfo(petId, requiredFile, additionalMetadata).getData();
-  }
-
-  /**
-   * uploads an image (required)
-   * 
-   * @param petId ID of pet to update (required)
-   * @param requiredFile file to upload (required)
-   * @param additionalMetadata Additional data to pass to server (optional)
-   * @return ApiResponse&lt;ModelApiResponse&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<ModelApiResponse> uploadFileWithRequiredFileWithHttpInfo(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'petId' is set
-    if (petId == null) {
-      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
-    }
-    
-    // verify the required parameter 'requiredFile' is set
-    if (requiredFile == null) {
-      throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile"
-      .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    if (additionalMetadata != null)
-      localVarFormParams.put("additionalMetadata", additionalMetadata);
-if (requiredFile != null)
-      localVarFormParams.put("requiredFile", requiredFile);
-
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "multipart/form-data"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "petstore_auth" };
-
-    GenericType<ModelApiResponse> localVarReturnType = new GenericType<ModelApiResponse>() {};
-
-    return apiClient.invokeAPI("PetApi.uploadFileWithRequiredFile", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
deleted file mode 100644
index 0e29deb7564..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/StoreApi.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import org.openapitools.client.model.Order;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class StoreApi {
-  private ApiClient apiClient;
-
-  public StoreApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public StoreApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * 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 (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public void deleteOrder(String orderId) throws ApiException {
-    deleteOrderWithHttpInfo(orderId);
-  }
-
-  /**
-   * 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 (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> deleteOrderWithHttpInfo(String orderId) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/store/order/{order_id}"
-      .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("StoreApi.deleteOrder", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return Map&lt;String, Integer&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public Map<String, Integer> getInventory() throws ApiException {
-    return getInventoryWithHttpInfo().getData();
-  }
-
-  /**
-   * Returns pet inventories by status
-   * Returns a map of status codes to quantities
-   * @return ApiResponse&lt;Map&lt;String, Integer&gt;&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Map<String, Integer>> getInventoryWithHttpInfo() throws ApiException {
-    Object localVarPostBody = null;
-    
-    // create path and map variables
-    String localVarPath = "/store/inventory";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] { "api_key" };
-
-    GenericType<Map<String, Integer>> localVarReturnType = new GenericType<Map<String, Integer>>() {};
-
-    return apiClient.invokeAPI("StoreApi.getInventory", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * 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 (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public Order getOrderById(Long orderId) throws ApiException {
-    return getOrderByIdWithHttpInfo(orderId).getData();
-  }
-
-  /**
-   * 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 (required)
-   * @return ApiResponse&lt;Order&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid ID supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> Order not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Order> getOrderByIdWithHttpInfo(Long orderId) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'orderId' is set
-    if (orderId == null) {
-      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/store/order/{order_id}"
-      .replaceAll("\\{" + "order_id" + "\\}", apiClient.escapeString(orderId.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
-
-    return apiClient.invokeAPI("StoreApi.getOrderById", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Place an order for a pet
-   * 
-   * @param order order placed for purchasing the pet (required)
-   * @return Order
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
-     </table>
-   */
-  public Order placeOrder(Order order) throws ApiException {
-    return placeOrderWithHttpInfo(order).getData();
-  }
-
-  /**
-   * Place an order for a pet
-   * 
-   * @param order order placed for purchasing the pet (required)
-   * @return ApiResponse&lt;Order&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid Order </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Order> placeOrderWithHttpInfo(Order order) throws ApiException {
-    Object localVarPostBody = order;
-    
-    // verify the required parameter 'order' is set
-    if (order == null) {
-      throw new ApiException(400, "Missing the required parameter 'order' when calling placeOrder");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/store/order";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<Order> localVarReturnType = new GenericType<Order>() {};
-
-    return apiClient.invokeAPI("StoreApi.placeOrder", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
deleted file mode 100644
index 9b6250da568..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/UserApi.java
+++ /dev/null
@@ -1,588 +0,0 @@
-package org.openapitools.client.api;
-
-import org.openapitools.client.ApiException;
-import org.openapitools.client.ApiClient;
-import org.openapitools.client.ApiResponse;
-import org.openapitools.client.Configuration;
-import org.openapitools.client.Pair;
-
-import javax.ws.rs.core.GenericType;
-
-import org.openapitools.client.model.User;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class UserApi {
-  private ApiClient apiClient;
-
-  public UserApi() {
-    this(Configuration.getDefaultApiClient());
-  }
-
-  public UserApi(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Get the API cilent
-   *
-   * @return API client
-   */
-  public ApiClient getApiClient() {
-    return apiClient;
-  }
-
-  /**
-   * Set the API cilent
-   *
-   * @param apiClient an instance of API client
-   */
-  public void setApiClient(ApiClient apiClient) {
-    this.apiClient = apiClient;
-  }
-
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param user Created user object (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void createUser(User user) throws ApiException {
-    createUserWithHttpInfo(user);
-  }
-
-  /**
-   * Create user
-   * This can only be done by the logged in user.
-   * @param user Created user object (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> createUserWithHttpInfo(User user) throws ApiException {
-    Object localVarPostBody = user;
-    
-    // verify the required parameter 'user' is set
-    if (user == null) {
-      throw new ApiException(400, "Missing the required parameter 'user' when calling createUser");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.createUser", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param user List of user object (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void createUsersWithArrayInput(List<User> user) throws ApiException {
-    createUsersWithArrayInputWithHttpInfo(user);
-  }
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param user List of user object (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> createUsersWithArrayInputWithHttpInfo(List<User> user) throws ApiException {
-    Object localVarPostBody = user;
-    
-    // verify the required parameter 'user' is set
-    if (user == null) {
-      throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithArrayInput");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/createWithArray";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.createUsersWithArrayInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param user List of user object (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void createUsersWithListInput(List<User> user) throws ApiException {
-    createUsersWithListInputWithHttpInfo(user);
-  }
-
-  /**
-   * Creates list of users with given input array
-   * 
-   * @param user List of user object (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> createUsersWithListInputWithHttpInfo(List<User> user) throws ApiException {
-    Object localVarPostBody = user;
-    
-    // verify the required parameter 'user' is set
-    if (user == null) {
-      throw new ApiException(400, "Missing the required parameter 'user' when calling createUsersWithListInput");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/createWithList";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.createUsersWithListInput", localVarPath, "POST", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public void deleteUser(String username) throws ApiException {
-    deleteUserWithHttpInfo(username);
-  }
-
-  /**
-   * Delete user
-   * This can only be done by the logged in user.
-   * @param username The name that needs to be deleted (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> deleteUserWithHttpInfo(String username) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/{username}"
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.deleteUser", localVarPath, "DELETE", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return User
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public User getUserByName(String username) throws ApiException {
-    return getUserByNameWithHttpInfo(username).getData();
-  }
-
-  /**
-   * Get user by user name
-   * 
-   * @param username The name that needs to be fetched. Use user1 for testing. (required)
-   * @return ApiResponse&lt;User&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  -  </td></tr>
-       <tr><td> 400 </td><td> Invalid username supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<User> getUserByNameWithHttpInfo(String username) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/{username}"
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<User> localVarReturnType = new GenericType<User>() {};
-
-    return apiClient.invokeAPI("UserApi.getUserByName", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return String
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
-       <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
-     </table>
-   */
-  public String loginUser(String username, String password) throws ApiException {
-    return loginUserWithHttpInfo(username, password).getData();
-  }
-
-  /**
-   * Logs user into the system
-   * 
-   * @param username The user name for login (required)
-   * @param password The password for login in clear text (required)
-   * @return ApiResponse&lt;String&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 200 </td><td> successful operation </td><td>  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  </td></tr>
-       <tr><td> 400 </td><td> Invalid username/password supplied </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<String> loginUserWithHttpInfo(String username, String password) throws ApiException {
-    Object localVarPostBody = null;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser");
-    }
-    
-    // verify the required parameter 'password' is set
-    if (password == null) {
-      throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/login";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "username", username));
-    localVarQueryParams.addAll(apiClient.parameterToPairs("", "password", password));
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      "application/xml", "application/json"
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    GenericType<String> localVarReturnType = new GenericType<String>() {};
-
-    return apiClient.invokeAPI("UserApi.loginUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, localVarReturnType, null);
-  }
-  /**
-   * Logs out current logged in user session
-   * 
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public void logoutUser() throws ApiException {
-    logoutUserWithHttpInfo();
-  }
-
-  /**
-   * Logs out current logged in user session
-   * 
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 0 </td><td> successful operation </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> logoutUserWithHttpInfo() throws ApiException {
-    Object localVarPostBody = null;
-    
-    // create path and map variables
-    String localVarPath = "/user/logout";
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.logoutUser", localVarPath, "GET", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param user Updated user object (required)
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public void updateUser(String username, User user) throws ApiException {
-    updateUserWithHttpInfo(username, user);
-  }
-
-  /**
-   * Updated user
-   * This can only be done by the logged in user.
-   * @param username name that need to be deleted (required)
-   * @param user Updated user object (required)
-   * @return ApiResponse&lt;Void&gt;
-   * @throws ApiException if fails to make API call
-   * @http.response.details
-     <table summary="Response Details" border="1">
-       <tr><td> Status Code </td><td> Description </td><td> Response Headers </td></tr>
-       <tr><td> 400 </td><td> Invalid user supplied </td><td>  -  </td></tr>
-       <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
-     </table>
-   */
-  public ApiResponse<Void> updateUserWithHttpInfo(String username, User user) throws ApiException {
-    Object localVarPostBody = user;
-    
-    // verify the required parameter 'username' is set
-    if (username == null) {
-      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
-    }
-    
-    // verify the required parameter 'user' is set
-    if (user == null) {
-      throw new ApiException(400, "Missing the required parameter 'user' when calling updateUser");
-    }
-    
-    // create path and map variables
-    String localVarPath = "/user/{username}"
-      .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
-
-    // query params
-    List<Pair> localVarQueryParams = new ArrayList<Pair>();
-    Map<String, String> localVarHeaderParams = new HashMap<String, String>();
-    Map<String, String> localVarCookieParams = new HashMap<String, String>();
-    Map<String, Object> localVarFormParams = new HashMap<String, Object>();
-
-
-    
-    
-    
-    final String[] localVarAccepts = {
-      
-    };
-    final String localVarAccept = apiClient.selectHeaderAccept(localVarAccepts);
-
-    final String[] localVarContentTypes = {
-      "application/json"
-    };
-    final String localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes);
-
-    String[] localVarAuthNames = new String[] {  };
-
-    return apiClient.invokeAPI("UserApi.updateUser", localVarPath, "PUT", localVarQueryParams, localVarPostBody,
-                               localVarHeaderParams, localVarCookieParams, localVarFormParams, localVarAccept, localVarContentType,
-                               localVarAuthNames, null, null);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
deleted file mode 100644
index c1b2e484070..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.List;
-
-
-public class ApiKeyAuth implements Authentication {
-  private final String location;
-  private final String paramName;
-
-  private String apiKey;
-  private String apiKeyPrefix;
-
-  public ApiKeyAuth(String location, String paramName) {
-    this.location = location;
-    this.paramName = paramName;
-  }
-
-  public String getLocation() {
-    return location;
-  }
-
-  public String getParamName() {
-    return paramName;
-  }
-
-  public String getApiKey() {
-    return apiKey;
-  }
-
-  public void setApiKey(String apiKey) {
-    this.apiKey = apiKey;
-  }
-
-  public String getApiKeyPrefix() {
-    return apiKeyPrefix;
-  }
-
-  public void setApiKeyPrefix(String apiKeyPrefix) {
-    this.apiKeyPrefix = apiKeyPrefix;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
-    if (apiKey == null) {
-      return;
-    }
-    String value;
-    if (apiKeyPrefix != null) {
-      value = apiKeyPrefix + " " + apiKey;
-    } else {
-      value = apiKey;
-    }
-    if ("query".equals(location)) {
-      queryParams.add(new Pair(paramName, value));
-    } else if ("header".equals(location)) {
-      headerParams.put(paramName, value);
-    } else if ("cookie".equals(location)) {
-      cookieParams.put(paramName, value);
-    }
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/Authentication.java
deleted file mode 100644
index 579b5e0d6d5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/Authentication.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.List;
-
-public interface Authentication {
-    /**
-     * Apply authentication settings to header and query params.
-     *
-     * @param queryParams List of query parameters
-     * @param headerParams Map of header parameters
-     * @param cookieParams Map of cookie parameters
-     */
-    void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException;
-
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
deleted file mode 100644
index e6f95e58563..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-
-import java.util.Base64;
-import java.nio.charset.StandardCharsets;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.List;
-
-
-
-public class HttpBasicAuth implements Authentication {
-  private String username;
-  private String password;
-
-  public String getUsername() {
-    return username;
-  }
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-  public String getPassword() {
-    return password;
-  }
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
-    if (username == null && password == null) {
-      return;
-    }
-    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
-    headerParams.put("Authorization", "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8)));
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
deleted file mode 100644
index 1b46b4c6839..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.List;
-
-
-public class HttpBearerAuth implements Authentication {
-  private final String scheme;
-  private String bearerToken;
-
-  public HttpBearerAuth(String scheme) {
-    this.scheme = scheme;
-  }
-
-  /**
-   * Gets the token, which together with the scheme, will be sent as the value of the Authorization header.
-   *
-   * @return The bearer token
-   */
-  public String getBearerToken() {
-    return bearerToken;
-  }
-
-  /**
-   * Sets the token, which together with the scheme, will be sent as the value of the Authorization header.
-   *
-   * @param bearerToken The bearer token to send in the Authorization header
-   */
-  public void setBearerToken(String bearerToken) {
-    this.bearerToken = bearerToken;
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams, String payload, String method, URI uri) throws ApiException {
-    if(bearerToken == null) {
-      return;
-    }
-
-    headerParams.put("Authorization", (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken);
-  }
-
-  private static String upperCaseBearer(String scheme) {
-    return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme;
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
deleted file mode 100644
index 5f0e4dba350..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/HttpSignatureAuth.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-
-import java.net.URI;
-import java.net.URLEncoder;
-import java.security.MessageDigest;
-import java.security.Key;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-import java.util.List;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.InvalidKeyException;
-
-import org.tomitribe.auth.signatures.Algorithm;
-import org.tomitribe.auth.signatures.Signer;
-import org.tomitribe.auth.signatures.Signature;
-import org.tomitribe.auth.signatures.SigningAlgorithm;
-
-/**
- * A Configuration object for the HTTP message signature security scheme.
- */
-public class HttpSignatureAuth implements Authentication {
-
-  private Signer signer;
-
-  // An opaque string that the server can use to look up the component they need to validate the signature.
-  private String keyId;
-
-  // The HTTP signature algorithm.
-  private SigningAlgorithm signingAlgorithm;
-
-  // The HTTP cryptographic algorithm.
-  private Algorithm algorithm;
-
-  // The cryptographic parameters.
-  private AlgorithmParameterSpec parameterSpec;
-
-  // The list of HTTP headers that should be included in the HTTP signature.
-  private List<String> headers;
-
-  // The digest algorithm which is used to calculate a cryptographic digest of the HTTP request body.
-  private String digestAlgorithm;
-
-  /**
-   * Construct a new HTTP signature auth configuration object.
-   *
-   * @param keyId An opaque string that the server can use to look up the component they need to validate the signature.
-   * @param signingAlgorithm The signature algorithm.
-   * @param algorithm The cryptographic algorithm.
-   * @param digestAlgorithm The digest algorithm.
-   * @param headers The list of HTTP headers that should be included in the HTTP signature.
-   */
-  public HttpSignatureAuth(String keyId,
-                           SigningAlgorithm signingAlgorithm,
-                           Algorithm algorithm,
-                           String digestAlgorithm,
-                           AlgorithmParameterSpec parameterSpec,
-                           List<String> headers) {
-    this.keyId = keyId;
-    this.signingAlgorithm = signingAlgorithm;
-    this.algorithm = algorithm;
-    this.parameterSpec = parameterSpec;
-    this.digestAlgorithm = digestAlgorithm;
-    this.headers = headers;
-  }
-
-  /**
-   * Returns the opaque string that the server can use to look up the component they need to validate the signature.
-   *
-   * @return The keyId.
-   */
-  public String getKeyId() {
-    return keyId;
-  }
-
-  /**
-   * Set the HTTP signature key id.
-   *
-   * @param keyId An opaque string that the server can use to look up the component they need to validate the signature.
-   */
-  public void setKeyId(String keyId) {
-    this.keyId = keyId;
-  }
-
-  /**
-   * Returns the HTTP signature algorithm which is used to sign HTTP requests.
-   */
-  public SigningAlgorithm getSigningAlgorithm() {
-    return signingAlgorithm;
-  }
-
-  /**
-   * Sets the HTTP signature algorithm which is used to sign HTTP requests.
-   *
-   * @param signingAlgorithm The HTTP signature algorithm.
-   */
-  public void setSigningAlgorithm(SigningAlgorithm signingAlgorithm) {
-    this.signingAlgorithm = signingAlgorithm;
-  }
-
-  /**
-   * Returns the HTTP cryptographic algorithm which is used to sign HTTP requests.
-   */
-  public Algorithm getAlgorithm() {
-    return algorithm;
-  }
-
-  /**
-   * Sets the HTTP cryptographic algorithm which is used to sign HTTP requests.
-   *
-   * @param algorithm The HTTP signature algorithm.
-   */
-  public void setAlgorithm(Algorithm algorithm) {
-    this.algorithm = algorithm;
-  }
-
-  /**
-   * Returns the cryptographic parameters which are used to sign HTTP requests.
-   */
-  public AlgorithmParameterSpec getAlgorithmParameterSpec() {
-    return parameterSpec;
-  }
-
-  /**
-   * Sets the cryptographic parameters which are used to sign HTTP requests.
-   *
-   * @param parameterSpec The cryptographic parameters.
-   */
-  public void setAlgorithmParameterSpec(AlgorithmParameterSpec parameterSpec) {
-    this.parameterSpec = parameterSpec;
-  }
-
-  /**
-   * Returns the digest algorithm which is used to calculate a cryptographic digest of the HTTP request body.
-   *
-   * @see java.security.MessageDigest
-   */
-  public String getDigestAlgorithm() {
-    return digestAlgorithm;
-  }
-
-  /**
-   * Sets the digest algorithm which is used to calculate a cryptographic digest of the HTTP request body.
-   *
-   * The exact list of supported digest algorithms depends on the installed security providers.
-   * Every implementation of the Java platform is required to support "MD5", "SHA-1" and "SHA-256".
-   * Do not use "MD5" and "SHA-1", they are vulnerable to multiple known attacks.
-   * By default, "SHA-256" is used.
-   *
-   * @param digestAlgorithm The digest algorithm.
-   *
-   * @see java.security.MessageDigest
-   */
-  public void setDigestAlgorithm(String digestAlgorithm) {
-    this.digestAlgorithm = digestAlgorithm;
-  }
-
-  /**
-   * Returns the list of HTTP headers that should be included in the HTTP signature.
-   */
-  public List<String> getHeaders() {
-    return headers;
-  }
-
-  /**
-   * Sets the list of HTTP headers that should be included in the HTTP signature.
-   *
-   * @param headers The HTTP headers.
-   */
-  public void setHeaders(List<String> headers) {
-    this.headers = headers;
-  }
-
-  /**
-   * Returns the signer instance used to sign HTTP messages.
-   *
-   * @return the signer instance.
-   */
-  public Signer getSigner() {
-    return signer;
-  }
-
-  /**
-   * Sets the signer instance used to sign HTTP messages.
-   *
-   * @param signer The signer instance to set.
-   */
-  public void setSigner(Signer signer) {
-    this.signer = signer;
-  }
-
-  /**
-   * Set the private key used to sign HTTP requests using the HTTP signature scheme.
-   *
-   * @param key The private key.
-   *
-   * @throws InvalidKeyException Unable to parse the key, or the security provider for this key
-   * is not installed.
-   */
-  public void setPrivateKey(Key key) throws InvalidKeyException, ApiException {
-    if (key == null) {
-      throw new ApiException("Private key (java.security.Key) cannot be null");
-    }
-    signer = new Signer(key, new Signature(keyId, signingAlgorithm, algorithm, parameterSpec, null, headers));
-  }
-
-  @Override
-  public void applyToParams(List<Pair> queryParams, Map<String, String> headerParams, Map<String, String> cookieParams,
-                            String payload, String method, URI uri) throws ApiException {
-    try {
-      if (headers.contains("host")) {
-        headerParams.put("host", uri.getHost());
-      }
-
-      if (headers.contains("date")) {
-        headerParams.put("date", new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US).format(new Date()));
-      }
-
-      if (headers.contains("digest")) {
-        headerParams.put("digest",
-          this.digestAlgorithm + "=" +
-            new String(Base64.getEncoder().encode(MessageDigest.getInstance(this.digestAlgorithm).digest(payload.getBytes()))));
-      }
-
-      if (signer == null) {
-        throw new ApiException("Signer cannot be null. Please call the method `setPrivateKey` to set it up correctly");
-      }
-
-      // construct the path with the URL query string
-      String path = uri.getPath();
-
-      List<String> urlQueries = new ArrayList<String>();
-      for (Pair queryParam : queryParams) {
-        urlQueries.add(queryParam.getName() + "=" + URLEncoder.encode(queryParam.getValue(), "utf8").replaceAll("\\+", "%20"));
-      }
-
-      if (!urlQueries.isEmpty()) {
-        path = path + "?" + String.join("&", urlQueries);
-      }
-
-      headerParams.put("Authorization", signer.sign(method, path, headerParams).toString());
-    } catch (Exception ex) {
-      throw new ApiException("Failed to create signature in the HTTP request header: " + ex.toString());
-    }
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
deleted file mode 100644
index 5751094fa1d..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * 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.client.auth;
-
-import org.openapitools.client.Pair;
-import org.openapitools.client.ApiException;
-import com.github.scribejava.core.builder.ServiceBuilder;
-import com.github.scribejava.core.builder.api.DefaultApi20;
-import com.github.scribejava.core.exceptions.OAuthException;
-import com.github.scribejava.core.model.OAuth2AccessToken;
-import com.github.scribejava.core.oauth.OAuth20Service;
-
-import javax.ws.rs.core.UriBuilder;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-
-public class OAuth implements Authentication {
-  private static final Logger log = Logger.getLogger(OAuth.class.getName());
-
-  private String tokenUrl;
-  private String absoluteTokenUrl;
-  private OAuthFlow flow = OAuthFlow.application;
-  private OAuth20Service service;
-  private DefaultApi20 authApi;
-  private String scope;
-  private String username;
-  private String password;
-  private String code;
-  private volatile OAuth2AccessToken accessToken;
-
-  public OAuth(String basePath, String tokenUrl) {
-    this.tokenUrl = tokenUrl;
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-    authApi = new DefaultApi20() {
-      @Override
-      public String getAccessTokenEndpoint() {
-        return absoluteTokenUrl;
-      }
-
-      @Override
-      protected String getAuthorizationBaseUrl() {
-        throw new UnsupportedOperationException("Shouldn't get there !");
-      }
-    };
-  }
-
-  private static String createAbsoluteTokenUrl(String basePath, String tokenUrl) {
-    if (!URI.create(tokenUrl).isAbsolute()) {
-      try {
-        return UriBuilder.fromPath(basePath).path(tokenUrl).build().toURL().toString();
-      } catch (MalformedURLException e) {
-        log.log(Level.SEVERE, "Couldn't create absolute token URL", e);
-      }
-    }
-    return tokenUrl;
-  }
-
-  @Override
-  public void applyToParams(
-      List<Pair> queryParams,
-      Map<String, String> headerParams,
-      Map<String, String> cookieParams,
-      String payload,
-      String method,
-      URI uri)
-      throws ApiException {
-
-    if (accessToken == null) {
-      obtainAccessToken(null);
-    }
-    if (accessToken != null) {
-      headerParams.put("Authorization", "Bearer " + accessToken.getAccessToken());
-    }
-  }
-
-  public OAuth2AccessToken renewAccessToken() throws ApiException {
-    String refreshToken = null;
-    if (accessToken != null) {
-      refreshToken = accessToken.getRefreshToken();
-      accessToken = null;
-    }
-    return obtainAccessToken(refreshToken);
-  }
-
-  public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) throws ApiException {
-    if (service == null) {
-      return null;
-    }
-    try {
-      if (refreshToken != null) {
-        return service.refreshAccessToken(refreshToken);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      log.log(Level.FINE, "Refreshing the access token using the refresh token failed", e);
-    }
-    try {
-      switch (flow) {
-        case password:
-          if (username != null && password != null) {
-            accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
-          }
-          break;
-        case accessCode:
-          if (code != null) {
-            accessToken = service.getAccessToken(code);
-            code = null;
-          }
-          break;
-        case application:
-          accessToken = service.getAccessTokenClientCredentialsGrant(scope);
-      }
-    } catch (OAuthException | InterruptedException | ExecutionException | IOException e) {
-      throw new ApiException(e);
-    }
-    return accessToken;
-  }
-
-  public OAuth2AccessToken getAccessToken() {
-    return accessToken;
-  }
-
-  public OAuth setAccessToken(OAuth2AccessToken accessToken) {
-    this.accessToken = accessToken;
-    return this;
-  }
-
-  public OAuth setAccessToken(String accessToken) {
-    this.accessToken = new OAuth2AccessToken(accessToken);
-    return this;
-  }
-
-  public OAuth setScope(String scope) {
-    this.scope = scope;
-    return this;
-  }
-
-  public OAuth setCredentials(String clientId, String clientSecret) {
-    service = new ServiceBuilder(clientId)
-        .apiSecret(clientSecret)
-        .build(authApi);
-    return this;
-  }
-
-  public OAuth usePasswordFlow(String username, String password) {
-    this.flow = OAuthFlow.password;
-    this.username = username;
-    this.password = password;
-    return this;
-  }
-
-  public OAuth useAuthorizationCodeFlow(String code) {
-    this.flow = OAuthFlow.accessCode;
-    this.code = code;
-    return this;
-  }
-
-  public OAuth setFlow(OAuthFlow flow) {
-    this.flow = flow;
-    return this;
-  }
-
-  public void setBasePath(String basePath) {
-    this.absoluteTokenUrl = createAbsoluteTokenUrl(basePath, tokenUrl);
-  }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java
deleted file mode 100644
index b2d11ff0c4f..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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.client.auth;
-
-public enum OAuthFlow {
-    accessCode, implicit, password, application
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
deleted file mode 100644
index 89269434446..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AbstractOpenApiSchema.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.client.model;
-
-import org.openapitools.client.ApiException;
-import java.util.Objects;
-import java.lang.reflect.Type;
-import java.util.Map;
-import javax.ws.rs.core.GenericType;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Abstract class for oneOf,anyOf schemas defined in OpenAPI spec
- */
-
-public abstract class AbstractOpenApiSchema {
-
-    // store the actual instance of the schema/object
-    private Object instance;
-
-    // is nullable
-    private Boolean isNullable;
-
-    // schema type (e.g. oneOf, anyOf)
-    private final String schemaType;
-
-    public AbstractOpenApiSchema(String schemaType, Boolean isNullable) {
-        this.schemaType = schemaType;
-        this.isNullable = isNullable;
-    }
-
-    /***
-     * Get the list of schemas allowed to be stored in this object
-     *
-     * @return an instance of the actual schema/object
-     */
-    public abstract Map<String, GenericType> getSchemas();
-
-    /***
-     * Get the actual instance
-     *
-     * @return an instance of the actual schema/object
-     */
-    @JsonValue
-    public Object getActualInstance() {return instance;}
-
-    /***
-     * Set the actual instance
-     *
-     * @param instance the actual instance of the schema/object
-     */
-    public void setActualInstance(Object instance) {this.instance = instance;}
-
-    /***
-     * Get the schema type (e.g. anyOf, oneOf)
-     *
-     * @return the schema type
-     */
-    public String getSchemaType() {
-        return schemaType;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append("class ").append(getClass()).append(" {\n");
-        sb.append("    instance: ").append(toIndentedString(instance)).append("\n");
-        sb.append("    isNullable: ").append(toIndentedString(isNullable)).append("\n");
-        sb.append("    schemaType: ").append(toIndentedString(schemaType)).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(java.lang.Object o) {
-        if (o == null) {
-            return "null";
-        }
-        return o.toString().replace("\n", "\n    ");
-    }
-
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        AbstractOpenApiSchema a = (AbstractOpenApiSchema) o;
-        return Objects.equals(this.instance, a.instance) &&
-            Objects.equals(this.isNullable, a.isNullable) &&
-            Objects.equals(this.schemaType, a.schemaType);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(instance, isNullable, schemaType);
-    }
-
-    /***
-     * Is nullalble
-     *
-     * @return true if it's nullable
-     */
-    public Boolean isNullable() {
-        if (Boolean.TRUE.equals(isNullable)) {
-            return Boolean.TRUE;
-        } else {
-            return Boolean.FALSE;
-        }
-    }
-}
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
deleted file mode 100644
index 624b19e97f3..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_PROPERTY,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_OF_MAP_PROPERTY,
-  AdditionalPropertiesClass.JSON_PROPERTY_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3,
-  AdditionalPropertiesClass.JSON_PROPERTY_EMPTY_MAP,
-  AdditionalPropertiesClass.JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING
-})
-
-public class AdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property";
-  private Map<String, String> mapProperty = null;
-
-  public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property";
-  private Map<String, Map<String, String>> mapOfMapProperty = null;
-
-  public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1";
-  private JsonNullable<Object> anytype1 = JsonNullable.<Object>of(null);
-
-  public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1 = "map_with_undeclared_properties_anytype_1";
-  private Object mapWithUndeclaredPropertiesAnytype1;
-
-  public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2 = "map_with_undeclared_properties_anytype_2";
-  private Object mapWithUndeclaredPropertiesAnytype2;
-
-  public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3";
-  private Map<String, Object> mapWithUndeclaredPropertiesAnytype3 = null;
-
-  public static final String JSON_PROPERTY_EMPTY_MAP = "empty_map";
-  private Object emptyMap;
-
-  public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string";
-  private Map<String, String> mapWithUndeclaredPropertiesString = null;
-
-
-  public AdditionalPropertiesClass mapProperty(Map<String, String> mapProperty) {
-    
-    this.mapProperty = mapProperty;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) {
-    if (this.mapProperty == null) {
-      this.mapProperty = new HashMap<>();
-    }
-    this.mapProperty.put(key, mapPropertyItem);
-    return this;
-  }
-
-   /**
-   * Get mapProperty
-   * @return mapProperty
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, String> getMapProperty() {
-    return mapProperty;
-  }
-
-
-  public void setMapProperty(Map<String, String> mapProperty) {
-    this.mapProperty = mapProperty;
-  }
-
-
-  public AdditionalPropertiesClass mapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    
-    this.mapOfMapProperty = mapOfMapProperty;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String, String> mapOfMapPropertyItem) {
-    if (this.mapOfMapProperty == null) {
-      this.mapOfMapProperty = new HashMap<>();
-    }
-    this.mapOfMapProperty.put(key, mapOfMapPropertyItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfMapProperty
-   * @return mapOfMapProperty
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapOfMapProperty() {
-    return mapOfMapProperty;
-  }
-
-
-  public void setMapOfMapProperty(Map<String, Map<String, String>> mapOfMapProperty) {
-    this.mapOfMapProperty = mapOfMapProperty;
-  }
-
-
-  public AdditionalPropertiesClass anytype1(Object anytype1) {
-    this.anytype1 = JsonNullable.<Object>of(anytype1);
-    
-    return this;
-  }
-
-   /**
-   * Get anytype1
-   * @return anytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public Object getAnytype1() {
-        return anytype1.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Object> getAnytype1_JsonNullable() {
-    return anytype1;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_ANYTYPE1)
-  public void setAnytype1_JsonNullable(JsonNullable<Object> anytype1) {
-    this.anytype1 = anytype1;
-  }
-
-  public void setAnytype1(Object anytype1) {
-    this.anytype1 = JsonNullable.<Object>of(anytype1);
-  }
-
-
-  public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapWithUndeclaredPropertiesAnytype1) {
-    
-    this.mapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
-    return this;
-  }
-
-   /**
-   * Get mapWithUndeclaredPropertiesAnytype1
-   * @return mapWithUndeclaredPropertiesAnytype1
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getMapWithUndeclaredPropertiesAnytype1() {
-    return mapWithUndeclaredPropertiesAnytype1;
-  }
-
-
-  public void setMapWithUndeclaredPropertiesAnytype1(Object mapWithUndeclaredPropertiesAnytype1) {
-    this.mapWithUndeclaredPropertiesAnytype1 = mapWithUndeclaredPropertiesAnytype1;
-  }
-
-
-  public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapWithUndeclaredPropertiesAnytype2) {
-    
-    this.mapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
-    return this;
-  }
-
-   /**
-   * Get mapWithUndeclaredPropertiesAnytype2
-   * @return mapWithUndeclaredPropertiesAnytype2
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getMapWithUndeclaredPropertiesAnytype2() {
-    return mapWithUndeclaredPropertiesAnytype2;
-  }
-
-
-  public void setMapWithUndeclaredPropertiesAnytype2(Object mapWithUndeclaredPropertiesAnytype2) {
-    this.mapWithUndeclaredPropertiesAnytype2 = mapWithUndeclaredPropertiesAnytype2;
-  }
-
-
-  public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype3(Map<String, Object> mapWithUndeclaredPropertiesAnytype3) {
-    
-    this.mapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(String key, Object mapWithUndeclaredPropertiesAnytype3Item) {
-    if (this.mapWithUndeclaredPropertiesAnytype3 == null) {
-      this.mapWithUndeclaredPropertiesAnytype3 = new HashMap<>();
-    }
-    this.mapWithUndeclaredPropertiesAnytype3.put(key, mapWithUndeclaredPropertiesAnytype3Item);
-    return this;
-  }
-
-   /**
-   * Get mapWithUndeclaredPropertiesAnytype3
-   * @return mapWithUndeclaredPropertiesAnytype3
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3)
-  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Object> getMapWithUndeclaredPropertiesAnytype3() {
-    return mapWithUndeclaredPropertiesAnytype3;
-  }
-
-
-  public void setMapWithUndeclaredPropertiesAnytype3(Map<String, Object> mapWithUndeclaredPropertiesAnytype3) {
-    this.mapWithUndeclaredPropertiesAnytype3 = mapWithUndeclaredPropertiesAnytype3;
-  }
-
-
-  public AdditionalPropertiesClass emptyMap(Object emptyMap) {
-    
-    this.emptyMap = emptyMap;
-    return this;
-  }
-
-   /**
-   * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
-   * @return emptyMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "an object with no declared properties and no undeclared properties, hence it's an empty map.")
-  @JsonProperty(JSON_PROPERTY_EMPTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getEmptyMap() {
-    return emptyMap;
-  }
-
-
-  public void setEmptyMap(Object emptyMap) {
-    this.emptyMap = emptyMap;
-  }
-
-
-  public AdditionalPropertiesClass mapWithUndeclaredPropertiesString(Map<String, String> mapWithUndeclaredPropertiesString) {
-    
-    this.mapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
-    return this;
-  }
-
-  public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String key, String mapWithUndeclaredPropertiesStringItem) {
-    if (this.mapWithUndeclaredPropertiesString == null) {
-      this.mapWithUndeclaredPropertiesString = new HashMap<>();
-    }
-    this.mapWithUndeclaredPropertiesString.put(key, mapWithUndeclaredPropertiesStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapWithUndeclaredPropertiesString
-   * @return mapWithUndeclaredPropertiesString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, String> getMapWithUndeclaredPropertiesString() {
-    return mapWithUndeclaredPropertiesString;
-  }
-
-
-  public void setMapWithUndeclaredPropertiesString(Map<String, String> mapWithUndeclaredPropertiesString) {
-    this.mapWithUndeclaredPropertiesString = mapWithUndeclaredPropertiesString;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
-    return Objects.equals(this.mapProperty, additionalPropertiesClass.mapProperty) &&
-        Objects.equals(this.mapOfMapProperty, additionalPropertiesClass.mapOfMapProperty) &&
-        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
-        Objects.equals(this.mapWithUndeclaredPropertiesAnytype1, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype1) &&
-        Objects.equals(this.mapWithUndeclaredPropertiesAnytype2, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype2) &&
-        Objects.equals(this.mapWithUndeclaredPropertiesAnytype3, additionalPropertiesClass.mapWithUndeclaredPropertiesAnytype3) &&
-        Objects.equals(this.emptyMap, additionalPropertiesClass.emptyMap) &&
-        Objects.equals(this.mapWithUndeclaredPropertiesString, additionalPropertiesClass.mapWithUndeclaredPropertiesString);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapProperty, mapOfMapProperty, anytype1, mapWithUndeclaredPropertiesAnytype1, mapWithUndeclaredPropertiesAnytype2, mapWithUndeclaredPropertiesAnytype3, emptyMap, mapWithUndeclaredPropertiesString);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AdditionalPropertiesClass {\n");
-    sb.append("    mapProperty: ").append(toIndentedString(mapProperty)).append("\n");
-    sb.append("    mapOfMapProperty: ").append(toIndentedString(mapOfMapProperty)).append("\n");
-    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
-    sb.append("    mapWithUndeclaredPropertiesAnytype1: ").append(toIndentedString(mapWithUndeclaredPropertiesAnytype1)).append("\n");
-    sb.append("    mapWithUndeclaredPropertiesAnytype2: ").append(toIndentedString(mapWithUndeclaredPropertiesAnytype2)).append("\n");
-    sb.append("    mapWithUndeclaredPropertiesAnytype3: ").append(toIndentedString(mapWithUndeclaredPropertiesAnytype3)).append("\n");
-    sb.append("    emptyMap: ").append(toIndentedString(emptyMap)).append("\n");
-    sb.append("    mapWithUndeclaredPropertiesString: ").append(toIndentedString(mapWithUndeclaredPropertiesString)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
deleted file mode 100644
index 307baecc963..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Cat;
-import org.openapitools.client.model.Dog;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Animal
- */
-@JsonPropertyOrder({
-  Animal.JSON_PROPERTY_CLASS_NAME,
-  Animal.JSON_PROPERTY_COLOR
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
-  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
-})
-
-public class Animal {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  private String className;
-
-  public static final String JSON_PROPERTY_COLOR = "color";
-  private String color = "red";
-
-
-  public Animal className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  public Animal color(String color) {
-    
-    this.color = color;
-    return this;
-  }
-
-   /**
-   * Get color
-   * @return color
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COLOR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getColor() {
-    return color;
-  }
-
-
-  public void setColor(String color) {
-    this.color = color;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Animal animal = (Animal) o;
-    return Objects.equals(this.className, animal.className) &&
-        Objects.equals(this.color, animal.color);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className, color);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Animal {\n");
-    sb.append("    className: ").append(toIndentedString(className)).append("\n");
-    sb.append("    color: ").append(toIndentedString(color)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
deleted file mode 100644
index e74a41ea199..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Apple
- */
-@JsonPropertyOrder({
-  Apple.JSON_PROPERTY_CULTIVAR,
-  Apple.JSON_PROPERTY_ORIGIN
-})
-
-public class Apple {
-  public static final String JSON_PROPERTY_CULTIVAR = "cultivar";
-  private String cultivar;
-
-  public static final String JSON_PROPERTY_ORIGIN = "origin";
-  private String origin;
-
-
-  public Apple cultivar(String cultivar) {
-    
-    this.cultivar = cultivar;
-    return this;
-  }
-
-   /**
-   * Get cultivar
-   * @return cultivar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CULTIVAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCultivar() {
-    return cultivar;
-  }
-
-
-  public void setCultivar(String cultivar) {
-    this.cultivar = cultivar;
-  }
-
-
-  public Apple origin(String origin) {
-    
-    this.origin = origin;
-    return this;
-  }
-
-   /**
-   * Get origin
-   * @return origin
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ORIGIN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getOrigin() {
-    return origin;
-  }
-
-
-  public void setOrigin(String origin) {
-    this.origin = origin;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Apple apple = (Apple) o;
-    return Objects.equals(this.cultivar, apple.cultivar) &&
-        Objects.equals(this.origin, apple.origin);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cultivar, origin);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Apple {\n");
-    sb.append("    cultivar: ").append(toIndentedString(cultivar)).append("\n");
-    sb.append("    origin: ").append(toIndentedString(origin)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
deleted file mode 100644
index 90a3207fc70..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * AppleReq
- */
-@JsonPropertyOrder({
-  AppleReq.JSON_PROPERTY_CULTIVAR,
-  AppleReq.JSON_PROPERTY_MEALY
-})
-
-public class AppleReq {
-  public static final String JSON_PROPERTY_CULTIVAR = "cultivar";
-  private String cultivar;
-
-  public static final String JSON_PROPERTY_MEALY = "mealy";
-  private Boolean mealy;
-
-
-  public AppleReq cultivar(String cultivar) {
-    
-    this.cultivar = cultivar;
-    return this;
-  }
-
-   /**
-   * Get cultivar
-   * @return cultivar
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CULTIVAR)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getCultivar() {
-    return cultivar;
-  }
-
-
-  public void setCultivar(String cultivar) {
-    this.cultivar = cultivar;
-  }
-
-
-  public AppleReq mealy(Boolean mealy) {
-    
-    this.mealy = mealy;
-    return this;
-  }
-
-   /**
-   * Get mealy
-   * @return mealy
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MEALY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getMealy() {
-    return mealy;
-  }
-
-
-  public void setMealy(Boolean mealy) {
-    this.mealy = mealy;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    AppleReq appleReq = (AppleReq) o;
-    return Objects.equals(this.cultivar, appleReq.cultivar) &&
-        Objects.equals(this.mealy, appleReq.mealy);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(cultivar, mealy);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class AppleReq {\n");
-    sb.append("    cultivar: ").append(toIndentedString(cultivar)).append("\n");
-    sb.append("    mealy: ").append(toIndentedString(mealy)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
deleted file mode 100644
index 28d19953c34..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayOfArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfArrayOfNumberOnly.JSON_PROPERTY_ARRAY_ARRAY_NUMBER
-})
-
-public class ArrayOfArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  private List<List<BigDecimal>> arrayArrayNumber = null;
-
-
-  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    
-    this.arrayArrayNumber = arrayArrayNumber;
-    return this;
-  }
-
-  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
-    if (this.arrayArrayNumber == null) {
-      this.arrayArrayNumber = new ArrayList<>();
-    }
-    this.arrayArrayNumber.add(arrayArrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayNumber
-   * @return arrayArrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<BigDecimal>> getArrayArrayNumber() {
-    return arrayArrayNumber;
-  }
-
-
-  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
-    this.arrayArrayNumber = arrayArrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayArrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfArrayOfNumberOnly {\n");
-    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
deleted file mode 100644
index 5eeac9d8ac5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayOfNumberOnly
- */
-@JsonPropertyOrder({
-  ArrayOfNumberOnly.JSON_PROPERTY_ARRAY_NUMBER
-})
-
-public class ArrayOfNumberOnly {
-  public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  private List<BigDecimal> arrayNumber = null;
-
-
-  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
-    
-    this.arrayNumber = arrayNumber;
-    return this;
-  }
-
-  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
-    if (this.arrayNumber == null) {
-      this.arrayNumber = new ArrayList<>();
-    }
-    this.arrayNumber.add(arrayNumberItem);
-    return this;
-  }
-
-   /**
-   * Get arrayNumber
-   * @return arrayNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<BigDecimal> getArrayNumber() {
-    return arrayNumber;
-  }
-
-
-  public void setArrayNumber(List<BigDecimal> arrayNumber) {
-    this.arrayNumber = arrayNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
-    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayOfNumberOnly {\n");
-    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
deleted file mode 100644
index df57098053e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.ReadOnlyFirst;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ArrayTest
- */
-@JsonPropertyOrder({
-  ArrayTest.JSON_PROPERTY_ARRAY_OF_STRING,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER,
-  ArrayTest.JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL
-})
-
-public class ArrayTest {
-  public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  private List<String> arrayOfString = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  private List<List<Long>> arrayArrayOfInteger = null;
-
-  public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
-
-
-  public ArrayTest arrayOfString(List<String> arrayOfString) {
-    
-    this.arrayOfString = arrayOfString;
-    return this;
-  }
-
-  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
-    if (this.arrayOfString == null) {
-      this.arrayOfString = new ArrayList<>();
-    }
-    this.arrayOfString.add(arrayOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get arrayOfString
-   * @return arrayOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<String> getArrayOfString() {
-    return arrayOfString;
-  }
-
-
-  public void setArrayOfString(List<String> arrayOfString) {
-    this.arrayOfString = arrayOfString;
-  }
-
-
-  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
-    if (this.arrayArrayOfInteger == null) {
-      this.arrayArrayOfInteger = new ArrayList<>();
-    }
-    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfInteger
-   * @return arrayArrayOfInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<Long>> getArrayArrayOfInteger() {
-    return arrayArrayOfInteger;
-  }
-
-
-  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
-    this.arrayArrayOfInteger = arrayArrayOfInteger;
-  }
-
-
-  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    
-    this.arrayArrayOfModel = arrayArrayOfModel;
-    return this;
-  }
-
-  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
-    if (this.arrayArrayOfModel == null) {
-      this.arrayArrayOfModel = new ArrayList<>();
-    }
-    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
-    return this;
-  }
-
-   /**
-   * Get arrayArrayOfModel
-   * @return arrayArrayOfModel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
-    return arrayArrayOfModel;
-  }
-
-
-  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
-    this.arrayArrayOfModel = arrayArrayOfModel;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ArrayTest arrayTest = (ArrayTest) o;
-    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
-        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
-        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ArrayTest {\n");
-    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
-    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
-    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
deleted file mode 100644
index bb8fd654e45..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Banana
- */
-@JsonPropertyOrder({
-  Banana.JSON_PROPERTY_LENGTH_CM
-})
-
-public class Banana {
-  public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";
-  private BigDecimal lengthCm;
-
-
-  public Banana lengthCm(BigDecimal lengthCm) {
-    
-    this.lengthCm = lengthCm;
-    return this;
-  }
-
-   /**
-   * Get lengthCm
-   * @return lengthCm
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_LENGTH_CM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getLengthCm() {
-    return lengthCm;
-  }
-
-
-  public void setLengthCm(BigDecimal lengthCm) {
-    this.lengthCm = lengthCm;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Banana banana = (Banana) o;
-    return Objects.equals(this.lengthCm, banana.lengthCm);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(lengthCm);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Banana {\n");
-    sb.append("    lengthCm: ").append(toIndentedString(lengthCm)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
deleted file mode 100644
index 719d1034095..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * BananaReq
- */
-@JsonPropertyOrder({
-  BananaReq.JSON_PROPERTY_LENGTH_CM,
-  BananaReq.JSON_PROPERTY_SWEET
-})
-
-public class BananaReq {
-  public static final String JSON_PROPERTY_LENGTH_CM = "lengthCm";
-  private BigDecimal lengthCm;
-
-  public static final String JSON_PROPERTY_SWEET = "sweet";
-  private Boolean sweet;
-
-
-  public BananaReq lengthCm(BigDecimal lengthCm) {
-    
-    this.lengthCm = lengthCm;
-    return this;
-  }
-
-   /**
-   * Get lengthCm
-   * @return lengthCm
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_LENGTH_CM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getLengthCm() {
-    return lengthCm;
-  }
-
-
-  public void setLengthCm(BigDecimal lengthCm) {
-    this.lengthCm = lengthCm;
-  }
-
-
-  public BananaReq sweet(Boolean sweet) {
-    
-    this.sweet = sweet;
-    return this;
-  }
-
-   /**
-   * Get sweet
-   * @return sweet
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SWEET)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getSweet() {
-    return sweet;
-  }
-
-
-  public void setSweet(Boolean sweet) {
-    this.sweet = sweet;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BananaReq bananaReq = (BananaReq) o;
-    return Objects.equals(this.lengthCm, bananaReq.lengthCm) &&
-        Objects.equals(this.sweet, bananaReq.sweet);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(lengthCm, sweet);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BananaReq {\n");
-    sb.append("    lengthCm: ").append(toIndentedString(lengthCm)).append("\n");
-    sb.append("    sweet: ").append(toIndentedString(sweet)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
deleted file mode 100644
index d13bc304b2d..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * BasquePig
- */
-@JsonPropertyOrder({
-  BasquePig.JSON_PROPERTY_CLASS_NAME
-})
-
-public class BasquePig {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  private String className;
-
-
-  public BasquePig className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    BasquePig basquePig = (BasquePig) o;
-    return Objects.equals(this.className, basquePig.className);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class BasquePig {\n");
-    sb.append("    className: ").append(toIndentedString(className)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
deleted file mode 100644
index 033e9788110..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Capitalization
- */
-@JsonPropertyOrder({
-  Capitalization.JSON_PROPERTY_SMALL_CAMEL,
-  Capitalization.JSON_PROPERTY_CAPITAL_CAMEL,
-  Capitalization.JSON_PROPERTY_SMALL_SNAKE,
-  Capitalization.JSON_PROPERTY_CAPITAL_SNAKE,
-  Capitalization.JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS,
-  Capitalization.JSON_PROPERTY_A_T_T_N_A_M_E
-})
-
-public class Capitalization {
-  public static final String JSON_PROPERTY_SMALL_CAMEL = "smallCamel";
-  private String smallCamel;
-
-  public static final String JSON_PROPERTY_CAPITAL_CAMEL = "CapitalCamel";
-  private String capitalCamel;
-
-  public static final String JSON_PROPERTY_SMALL_SNAKE = "small_Snake";
-  private String smallSnake;
-
-  public static final String JSON_PROPERTY_CAPITAL_SNAKE = "Capital_Snake";
-  private String capitalSnake;
-
-  public static final String JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS = "SCA_ETH_Flow_Points";
-  private String scAETHFlowPoints;
-
-  public static final String JSON_PROPERTY_A_T_T_N_A_M_E = "ATT_NAME";
-  private String ATT_NAME;
-
-
-  public Capitalization smallCamel(String smallCamel) {
-    
-    this.smallCamel = smallCamel;
-    return this;
-  }
-
-   /**
-   * Get smallCamel
-   * @return smallCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallCamel() {
-    return smallCamel;
-  }
-
-
-  public void setSmallCamel(String smallCamel) {
-    this.smallCamel = smallCamel;
-  }
-
-
-  public Capitalization capitalCamel(String capitalCamel) {
-    
-    this.capitalCamel = capitalCamel;
-    return this;
-  }
-
-   /**
-   * Get capitalCamel
-   * @return capitalCamel
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalCamel() {
-    return capitalCamel;
-  }
-
-
-  public void setCapitalCamel(String capitalCamel) {
-    this.capitalCamel = capitalCamel;
-  }
-
-
-  public Capitalization smallSnake(String smallSnake) {
-    
-    this.smallSnake = smallSnake;
-    return this;
-  }
-
-   /**
-   * Get smallSnake
-   * @return smallSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getSmallSnake() {
-    return smallSnake;
-  }
-
-
-  public void setSmallSnake(String smallSnake) {
-    this.smallSnake = smallSnake;
-  }
-
-
-  public Capitalization capitalSnake(String capitalSnake) {
-    
-    this.capitalSnake = capitalSnake;
-    return this;
-  }
-
-   /**
-   * Get capitalSnake
-   * @return capitalSnake
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCapitalSnake() {
-    return capitalSnake;
-  }
-
-
-  public void setCapitalSnake(String capitalSnake) {
-    this.capitalSnake = capitalSnake;
-  }
-
-
-  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
-    
-    this.scAETHFlowPoints = scAETHFlowPoints;
-    return this;
-  }
-
-   /**
-   * Get scAETHFlowPoints
-   * @return scAETHFlowPoints
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getScAETHFlowPoints() {
-    return scAETHFlowPoints;
-  }
-
-
-  public void setScAETHFlowPoints(String scAETHFlowPoints) {
-    this.scAETHFlowPoints = scAETHFlowPoints;
-  }
-
-
-  public Capitalization ATT_NAME(String ATT_NAME) {
-    
-    this.ATT_NAME = ATT_NAME;
-    return this;
-  }
-
-   /**
-   * Name of the pet 
-   * @return ATT_NAME
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Name of the pet ")
-  @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getATTNAME() {
-    return ATT_NAME;
-  }
-
-
-  public void setATTNAME(String ATT_NAME) {
-    this.ATT_NAME = ATT_NAME;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Capitalization capitalization = (Capitalization) o;
-    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
-        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
-        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
-        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
-        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
-        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Capitalization {\n");
-    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
-    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
-    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
-    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
-    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
-    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
deleted file mode 100644
index 05e080b3229..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.CatAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Cat
- */
-@JsonPropertyOrder({
-  Cat.JSON_PROPERTY_DECLAWED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class Cat extends Animal {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public Cat declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Cat cat = (Cat) o;
-    return Objects.equals(this.declawed, cat.declawed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Cat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
deleted file mode 100644
index 3e7b991436a..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * CatAllOf
- */
-@JsonPropertyOrder({
-  CatAllOf.JSON_PROPERTY_DECLAWED
-})
-
-public class CatAllOf {
-  public static final String JSON_PROPERTY_DECLAWED = "declawed";
-  private Boolean declawed;
-
-
-  public CatAllOf declawed(Boolean declawed) {
-    
-    this.declawed = declawed;
-    return this;
-  }
-
-   /**
-   * Get declawed
-   * @return declawed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DECLAWED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getDeclawed() {
-    return declawed;
-  }
-
-
-  public void setDeclawed(Boolean declawed) {
-    this.declawed = declawed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    CatAllOf catAllOf = (CatAllOf) o;
-    return Objects.equals(this.declawed, catAllOf.declawed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(declawed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class CatAllOf {\n");
-    sb.append("    declawed: ").append(toIndentedString(declawed)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
deleted file mode 100644
index 868ba875074..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Category
- */
-@JsonPropertyOrder({
-  Category.JSON_PROPERTY_ID,
-  Category.JSON_PROPERTY_NAME
-})
-
-public class Category {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name = "default-name";
-
-
-  public Category id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Category name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Category category = (Category) o;
-    return Objects.equals(this.id, category.id) &&
-        Objects.equals(this.name, category.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Category {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
deleted file mode 100644
index 272be70fc2a..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ChildCatAllOf;
-import org.openapitools.client.model.ParentPet;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ChildCat
- */
-@JsonPropertyOrder({
-  ChildCat.JSON_PROPERTY_NAME
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
-@JsonSubTypes({
-})
-
-public class ChildCat extends ParentPet {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public ChildCat name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ChildCat childCat = (ChildCat) o;
-    return Objects.equals(this.name, childCat.name) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ChildCat {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
deleted file mode 100644
index aa495e74cd4..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCatAllOf.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ChildCatAllOf
- */
-@JsonPropertyOrder({
-  ChildCatAllOf.JSON_PROPERTY_NAME
-})
-
-public class ChildCatAllOf {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public ChildCatAllOf name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ChildCatAllOf childCatAllOf = (ChildCatAllOf) o;
-    return Objects.equals(this.name, childCatAllOf.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ChildCatAllOf {\n");
-    sb.append("    name: ").append(toIndentedString(name)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
deleted file mode 100644
index 4de7664b26a..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model with \&quot;_class\&quot; property
- */
-@ApiModel(description = "Model for testing model with \"_class\" property")
-@JsonPropertyOrder({
-  ClassModel.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class ClassModel {
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "_class";
-  private String propertyClass;
-
-
-  public ClassModel propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ClassModel classModel = (ClassModel) o;
-    return Objects.equals(this.propertyClass, classModel.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ClassModel {\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
deleted file mode 100644
index 02b0aac2247..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Client
- */
-@JsonPropertyOrder({
-  Client.JSON_PROPERTY_CLIENT
-})
-
-public class Client {
-  public static final String JSON_PROPERTY_CLIENT = "client";
-  private String client;
-
-
-  public Client client(String client) {
-    
-    this.client = client;
-    return this;
-  }
-
-   /**
-   * Get client
-   * @return client
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CLIENT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getClient() {
-    return client;
-  }
-
-
-  public void setClient(String client) {
-    this.client = client;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Client client = (Client) o;
-    return Objects.equals(this.client, client.client);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(client);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Client {\n");
-    sb.append("    client: ").append(toIndentedString(client)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
deleted file mode 100644
index 7e99e3ec4bf..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.QuadrilateralInterface;
-import org.openapitools.client.model.ShapeInterface;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ComplexQuadrilateral
- */
-@JsonPropertyOrder({
-  ComplexQuadrilateral.JSON_PROPERTY_SHAPE_TYPE,
-  ComplexQuadrilateral.JSON_PROPERTY_QUADRILATERAL_TYPE
-})
-
-public class ComplexQuadrilateral {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-  public static final String JSON_PROPERTY_QUADRILATERAL_TYPE = "quadrilateralType";
-  private String quadrilateralType;
-
-
-  public ComplexQuadrilateral shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
-    
-    this.quadrilateralType = quadrilateralType;
-    return this;
-  }
-
-   /**
-   * Get quadrilateralType
-   * @return quadrilateralType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getQuadrilateralType() {
-    return quadrilateralType;
-  }
-
-
-  public void setQuadrilateralType(String quadrilateralType) {
-    this.quadrilateralType = quadrilateralType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ComplexQuadrilateral complexQuadrilateral = (ComplexQuadrilateral) o;
-    return Objects.equals(this.shapeType, complexQuadrilateral.shapeType) &&
-        Objects.equals(this.quadrilateralType, complexQuadrilateral.quadrilateralType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType, quadrilateralType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ComplexQuadrilateral {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
-    sb.append("    quadrilateralType: ").append(toIndentedString(quadrilateralType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
deleted file mode 100644
index cf490737421..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * DanishPig
- */
-@JsonPropertyOrder({
-  DanishPig.JSON_PROPERTY_CLASS_NAME
-})
-
-public class DanishPig {
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  private String className;
-
-
-  public DanishPig className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DanishPig danishPig = (DanishPig) o;
-    return Objects.equals(this.className, danishPig.className);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(className);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DanishPig {\n");
-    sb.append("    className: ").append(toIndentedString(className)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
deleted file mode 100644
index f5665804368..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Animal;
-import org.openapitools.client.model.DogAllOf;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Dog
- */
-@JsonPropertyOrder({
-  Dog.JSON_PROPERTY_BREED
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "className", visible = true)
-@JsonSubTypes({
-})
-
-public class Dog extends Animal {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public Dog breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Dog dog = (Dog) o;
-    return Objects.equals(this.breed, dog.breed) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Dog {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
deleted file mode 100644
index dd42595cf20..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * DogAllOf
- */
-@JsonPropertyOrder({
-  DogAllOf.JSON_PROPERTY_BREED
-})
-
-public class DogAllOf {
-  public static final String JSON_PROPERTY_BREED = "breed";
-  private String breed;
-
-
-  public DogAllOf breed(String breed) {
-    
-    this.breed = breed;
-    return this;
-  }
-
-   /**
-   * Get breed
-   * @return breed
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BREED)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBreed() {
-    return breed;
-  }
-
-
-  public void setBreed(String breed) {
-    this.breed = breed;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    DogAllOf dogAllOf = (DogAllOf) o;
-    return Objects.equals(this.breed, dogAllOf.breed);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(breed);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class DogAllOf {\n");
-    sb.append("    breed: ").append(toIndentedString(breed)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
deleted file mode 100644
index f92f7d3f461..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Drawing.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.openapitools.client.model.Fruit;
-import org.openapitools.client.model.NullableShape;
-import org.openapitools.client.model.Shape;
-import org.openapitools.client.model.ShapeOrNull;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Drawing
- */
-@JsonPropertyOrder({
-  Drawing.JSON_PROPERTY_MAIN_SHAPE,
-  Drawing.JSON_PROPERTY_SHAPE_OR_NULL,
-  Drawing.JSON_PROPERTY_NULLABLE_SHAPE,
-  Drawing.JSON_PROPERTY_SHAPES
-})
-
-public class Drawing extends HashMap<String, Fruit> {
-  public static final String JSON_PROPERTY_MAIN_SHAPE = "mainShape";
-  private Shape mainShape = null;
-
-  public static final String JSON_PROPERTY_SHAPE_OR_NULL = "shapeOrNull";
-  private ShapeOrNull shapeOrNull = null;
-
-  public static final String JSON_PROPERTY_NULLABLE_SHAPE = "nullableShape";
-  private JsonNullable<NullableShape> nullableShape = JsonNullable.<NullableShape>of(null);
-
-  public static final String JSON_PROPERTY_SHAPES = "shapes";
-  private List<Shape> shapes = null;
-
-
-  public Drawing mainShape(Shape mainShape) {
-    
-    this.mainShape = mainShape;
-    return this;
-  }
-
-   /**
-   * Get mainShape
-   * @return mainShape
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAIN_SHAPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Shape getMainShape() {
-    return mainShape;
-  }
-
-
-  public void setMainShape(Shape mainShape) {
-    this.mainShape = mainShape;
-  }
-
-
-  public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
-    
-    this.shapeOrNull = shapeOrNull;
-    return this;
-  }
-
-   /**
-   * Get shapeOrNull
-   * @return shapeOrNull
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_OR_NULL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public ShapeOrNull getShapeOrNull() {
-    return shapeOrNull;
-  }
-
-
-  public void setShapeOrNull(ShapeOrNull shapeOrNull) {
-    this.shapeOrNull = shapeOrNull;
-  }
-
-
-  public Drawing nullableShape(NullableShape nullableShape) {
-    this.nullableShape = JsonNullable.<NullableShape>of(nullableShape);
-    
-    return this;
-  }
-
-   /**
-   * Get nullableShape
-   * @return nullableShape
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public NullableShape getNullableShape() {
-        return nullableShape.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_NULLABLE_SHAPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<NullableShape> getNullableShape_JsonNullable() {
-    return nullableShape;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_NULLABLE_SHAPE)
-  public void setNullableShape_JsonNullable(JsonNullable<NullableShape> nullableShape) {
-    this.nullableShape = nullableShape;
-  }
-
-  public void setNullableShape(NullableShape nullableShape) {
-    this.nullableShape = JsonNullable.<NullableShape>of(nullableShape);
-  }
-
-
-  public Drawing shapes(List<Shape> shapes) {
-    
-    this.shapes = shapes;
-    return this;
-  }
-
-  public Drawing addShapesItem(Shape shapesItem) {
-    if (this.shapes == null) {
-      this.shapes = new ArrayList<>();
-    }
-    this.shapes.add(shapesItem);
-    return this;
-  }
-
-   /**
-   * Get shapes
-   * @return shapes
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Shape> getShapes() {
-    return shapes;
-  }
-
-
-  public void setShapes(List<Shape> shapes) {
-    this.shapes = shapes;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Drawing drawing = (Drawing) o;
-    return Objects.equals(this.mainShape, drawing.mainShape) &&
-        Objects.equals(this.shapeOrNull, drawing.shapeOrNull) &&
-        Objects.equals(this.nullableShape, drawing.nullableShape) &&
-        Objects.equals(this.shapes, drawing.shapes) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mainShape, shapeOrNull, nullableShape, shapes, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Drawing {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    mainShape: ").append(toIndentedString(mainShape)).append("\n");
-    sb.append("    shapeOrNull: ").append(toIndentedString(shapeOrNull)).append("\n");
-    sb.append("    nullableShape: ").append(toIndentedString(nullableShape)).append("\n");
-    sb.append("    shapes: ").append(toIndentedString(shapes)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
deleted file mode 100644
index 86526adb3fa..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * EnumArrays
- */
-@JsonPropertyOrder({
-  EnumArrays.JSON_PROPERTY_JUST_SYMBOL,
-  EnumArrays.JSON_PROPERTY_ARRAY_ENUM
-})
-
-public class EnumArrays {
-  /**
-   * Gets or Sets justSymbol
-   */
-  public enum JustSymbolEnum {
-    GREATER_THAN_OR_EQUAL_TO(">="),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    JustSymbolEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static JustSymbolEnum fromValue(String value) {
-      for (JustSymbolEnum b : JustSymbolEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_JUST_SYMBOL = "just_symbol";
-  private JustSymbolEnum justSymbol;
-
-  /**
-   * Gets or Sets arrayEnum
-   */
-  public enum ArrayEnumEnum {
-    FISH("fish"),
-    
-    CRAB("crab");
-
-    private String value;
-
-    ArrayEnumEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static ArrayEnumEnum fromValue(String value) {
-      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  private List<ArrayEnumEnum> arrayEnum = null;
-
-
-  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
-    
-    this.justSymbol = justSymbol;
-    return this;
-  }
-
-   /**
-   * Get justSymbol
-   * @return justSymbol
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JustSymbolEnum getJustSymbol() {
-    return justSymbol;
-  }
-
-
-  public void setJustSymbol(JustSymbolEnum justSymbol) {
-    this.justSymbol = justSymbol;
-  }
-
-
-  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    
-    this.arrayEnum = arrayEnum;
-    return this;
-  }
-
-  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
-    if (this.arrayEnum == null) {
-      this.arrayEnum = new ArrayList<>();
-    }
-    this.arrayEnum.add(arrayEnumItem);
-    return this;
-  }
-
-   /**
-   * Get arrayEnum
-   * @return arrayEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<ArrayEnumEnum> getArrayEnum() {
-    return arrayEnum;
-  }
-
-
-  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
-    this.arrayEnum = arrayEnum;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumArrays enumArrays = (EnumArrays) o;
-    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
-        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justSymbol, arrayEnum);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumArrays {\n");
-    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
-    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
deleted file mode 100644
index e9102d97427..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumClass.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets EnumClass
- */
-public enum EnumClass {
-  
-  _ABC("_abc"),
-  
-  _EFG("-efg"),
-  
-  _XYZ_("(xyz)");
-
-  private String value;
-
-  EnumClass(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static EnumClass fromValue(String value) {
-    for (EnumClass b : EnumClass.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
deleted file mode 100644
index cf6d574a5f9..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.OuterEnum;
-import org.openapitools.client.model.OuterEnumDefaultValue;
-import org.openapitools.client.model.OuterEnumInteger;
-import org.openapitools.client.model.OuterEnumIntegerDefaultValue;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * EnumTest
- */
-@JsonPropertyOrder({
-  EnumTest.JSON_PROPERTY_ENUM_STRING,
-  EnumTest.JSON_PROPERTY_ENUM_STRING_REQUIRED,
-  EnumTest.JSON_PROPERTY_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_ENUM_NUMBER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE,
-  EnumTest.JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE
-})
-
-public class EnumTest {
-  /**
-   * Gets or Sets enumString
-   */
-  public enum EnumStringEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringEnum fromValue(String value) {
-      for (EnumStringEnum b : EnumStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING = "enum_string";
-  private EnumStringEnum enumString;
-
-  /**
-   * Gets or Sets enumStringRequired
-   */
-  public enum EnumStringRequiredEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower"),
-    
-    EMPTY("");
-
-    private String value;
-
-    EnumStringRequiredEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumStringRequiredEnum fromValue(String value) {
-      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_STRING_REQUIRED = "enum_string_required";
-  private EnumStringRequiredEnum enumStringRequired;
-
-  /**
-   * Gets or Sets enumInteger
-   */
-  public enum EnumIntegerEnum {
-    NUMBER_1(1),
-    
-    NUMBER_MINUS_1(-1);
-
-    private Integer value;
-
-    EnumIntegerEnum(Integer value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Integer getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumIntegerEnum fromValue(Integer value) {
-      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
-  private EnumIntegerEnum enumInteger;
-
-  /**
-   * Gets or Sets enumNumber
-   */
-  public enum EnumNumberEnum {
-    NUMBER_1_DOT_1(1.1),
-    
-    NUMBER_MINUS_1_DOT_2(-1.2);
-
-    private Double value;
-
-    EnumNumberEnum(Double value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public Double getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumNumberEnum fromValue(Double value) {
-      for (EnumNumberEnum b : EnumNumberEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_NUMBER = "enum_number";
-  private EnumNumberEnum enumNumber;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM = "outerEnum";
-  private JsonNullable<OuterEnum> outerEnum = JsonNullable.<OuterEnum>undefined();
-
-  public static final String JSON_PROPERTY_OUTER_ENUM_INTEGER = "outerEnumInteger";
-  private OuterEnumInteger outerEnumInteger;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE = "outerEnumDefaultValue";
-  private OuterEnumDefaultValue outerEnumDefaultValue = OuterEnumDefaultValue.PLACED;
-
-  public static final String JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE = "outerEnumIntegerDefaultValue";
-  private OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue = OuterEnumIntegerDefaultValue.NUMBER_0;
-
-
-  public EnumTest enumString(EnumStringEnum enumString) {
-    
-    this.enumString = enumString;
-    return this;
-  }
-
-   /**
-   * Get enumString
-   * @return enumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumStringEnum getEnumString() {
-    return enumString;
-  }
-
-
-  public void setEnumString(EnumStringEnum enumString) {
-    this.enumString = enumString;
-  }
-
-
-  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    
-    this.enumStringRequired = enumStringRequired;
-    return this;
-  }
-
-   /**
-   * Get enumStringRequired
-   * @return enumStringRequired
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public EnumStringRequiredEnum getEnumStringRequired() {
-    return enumStringRequired;
-  }
-
-
-  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
-    this.enumStringRequired = enumStringRequired;
-  }
-
-
-  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
-    
-    this.enumInteger = enumInteger;
-    return this;
-  }
-
-   /**
-   * Get enumInteger
-   * @return enumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumIntegerEnum getEnumInteger() {
-    return enumInteger;
-  }
-
-
-  public void setEnumInteger(EnumIntegerEnum enumInteger) {
-    this.enumInteger = enumInteger;
-  }
-
-
-  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
-    
-    this.enumNumber = enumNumber;
-    return this;
-  }
-
-   /**
-   * Get enumNumber
-   * @return enumNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumNumberEnum getEnumNumber() {
-    return enumNumber;
-  }
-
-
-  public void setEnumNumber(EnumNumberEnum enumNumber) {
-    this.enumNumber = enumNumber;
-  }
-
-
-  public EnumTest outerEnum(OuterEnum outerEnum) {
-    this.outerEnum = JsonNullable.<OuterEnum>of(outerEnum);
-    
-    return this;
-  }
-
-   /**
-   * Get outerEnum
-   * @return outerEnum
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public OuterEnum getOuterEnum() {
-        return outerEnum.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<OuterEnum> getOuterEnum_JsonNullable() {
-    return outerEnum;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
-  public void setOuterEnum_JsonNullable(JsonNullable<OuterEnum> outerEnum) {
-    this.outerEnum = outerEnum;
-  }
-
-  public void setOuterEnum(OuterEnum outerEnum) {
-    this.outerEnum = JsonNullable.<OuterEnum>of(outerEnum);
-  }
-
-
-  public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
-    
-    this.outerEnumInteger = outerEnumInteger;
-    return this;
-  }
-
-   /**
-   * Get outerEnumInteger
-   * @return outerEnumInteger
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnumInteger getOuterEnumInteger() {
-    return outerEnumInteger;
-  }
-
-
-  public void setOuterEnumInteger(OuterEnumInteger outerEnumInteger) {
-    this.outerEnumInteger = outerEnumInteger;
-  }
-
-
-  public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue) {
-    
-    this.outerEnumDefaultValue = outerEnumDefaultValue;
-    return this;
-  }
-
-   /**
-   * Get outerEnumDefaultValue
-   * @return outerEnumDefaultValue
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnumDefaultValue getOuterEnumDefaultValue() {
-    return outerEnumDefaultValue;
-  }
-
-
-  public void setOuterEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValue) {
-    this.outerEnumDefaultValue = outerEnumDefaultValue;
-  }
-
-
-  public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
-    
-    this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
-    return this;
-  }
-
-   /**
-   * Get outerEnumIntegerDefaultValue
-   * @return outerEnumIntegerDefaultValue
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() {
-    return outerEnumIntegerDefaultValue;
-  }
-
-
-  public void setOuterEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
-    this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EnumTest enumTest = (EnumTest) o;
-    return Objects.equals(this.enumString, enumTest.enumString) &&
-        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
-        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
-        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
-        Objects.equals(this.outerEnum, enumTest.outerEnum) &&
-        Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) &&
-        Objects.equals(this.outerEnumDefaultValue, enumTest.outerEnumDefaultValue) &&
-        Objects.equals(this.outerEnumIntegerDefaultValue, enumTest.outerEnumIntegerDefaultValue);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum, outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EnumTest {\n");
-    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
-    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
-    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
-    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
-    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
-    sb.append("    outerEnumInteger: ").append(toIndentedString(outerEnumInteger)).append("\n");
-    sb.append("    outerEnumDefaultValue: ").append(toIndentedString(outerEnumDefaultValue)).append("\n");
-    sb.append("    outerEnumIntegerDefaultValue: ").append(toIndentedString(outerEnumIntegerDefaultValue)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
deleted file mode 100644
index 6e93c9efbf8..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ShapeInterface;
-import org.openapitools.client.model.TriangleInterface;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * EquilateralTriangle
- */
-@JsonPropertyOrder({
-  EquilateralTriangle.JSON_PROPERTY_SHAPE_TYPE,
-  EquilateralTriangle.JSON_PROPERTY_TRIANGLE_TYPE
-})
-
-public class EquilateralTriangle {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-  public static final String JSON_PROPERTY_TRIANGLE_TYPE = "triangleType";
-  private String triangleType;
-
-
-  public EquilateralTriangle shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  public EquilateralTriangle triangleType(String triangleType) {
-    
-    this.triangleType = triangleType;
-    return this;
-  }
-
-   /**
-   * Get triangleType
-   * @return triangleType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getTriangleType() {
-    return triangleType;
-  }
-
-
-  public void setTriangleType(String triangleType) {
-    this.triangleType = triangleType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    EquilateralTriangle equilateralTriangle = (EquilateralTriangle) o;
-    return Objects.equals(this.shapeType, equilateralTriangle.shapeType) &&
-        Objects.equals(this.triangleType, equilateralTriangle.triangleType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType, triangleType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class EquilateralTriangle {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
-    sb.append("    triangleType: ").append(toIndentedString(triangleType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
deleted file mode 100644
index cfd62fbce62..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * FileSchemaTestClass
- */
-@JsonPropertyOrder({
-  FileSchemaTestClass.JSON_PROPERTY_FILE,
-  FileSchemaTestClass.JSON_PROPERTY_FILES
-})
-
-public class FileSchemaTestClass {
-  public static final String JSON_PROPERTY_FILE = "file";
-  private java.io.File file;
-
-  public static final String JSON_PROPERTY_FILES = "files";
-  private List<java.io.File> files = null;
-
-
-  public FileSchemaTestClass file(java.io.File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * Get file
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public java.io.File getFile() {
-    return file;
-  }
-
-
-  public void setFile(java.io.File file) {
-    this.file = file;
-  }
-
-
-  public FileSchemaTestClass files(List<java.io.File> files) {
-    
-    this.files = files;
-    return this;
-  }
-
-  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
-    if (this.files == null) {
-      this.files = new ArrayList<>();
-    }
-    this.files.add(filesItem);
-    return this;
-  }
-
-   /**
-   * Get files
-   * @return files
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FILES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<java.io.File> getFiles() {
-    return files;
-  }
-
-
-  public void setFiles(List<java.io.File> files) {
-    this.files = files;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
-    return Objects.equals(this.file, fileSchemaTestClass.file) &&
-        Objects.equals(this.files, fileSchemaTestClass.files);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(file, files);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FileSchemaTestClass {\n");
-    sb.append("    file: ").append(toIndentedString(file)).append("\n");
-    sb.append("    files: ").append(toIndentedString(files)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
deleted file mode 100644
index e531ce87dbf..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Foo
- */
-@JsonPropertyOrder({
-  Foo.JSON_PROPERTY_BAR
-})
-
-public class Foo {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar = "bar";
-
-
-  public Foo bar(String bar) {
-    
-    this.bar = bar;
-    return this;
-  }
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-  public void setBar(String bar) {
-    this.bar = bar;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Foo foo = (Foo) o;
-    return Objects.equals(this.bar, foo.bar);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Foo {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
deleted file mode 100644
index 4440eda8d8e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.UUID;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * FormatTest
- */
-@JsonPropertyOrder({
-  FormatTest.JSON_PROPERTY_INTEGER,
-  FormatTest.JSON_PROPERTY_INT32,
-  FormatTest.JSON_PROPERTY_INT64,
-  FormatTest.JSON_PROPERTY_NUMBER,
-  FormatTest.JSON_PROPERTY_FLOAT,
-  FormatTest.JSON_PROPERTY_DOUBLE,
-  FormatTest.JSON_PROPERTY_STRING,
-  FormatTest.JSON_PROPERTY_BYTE,
-  FormatTest.JSON_PROPERTY_BINARY,
-  FormatTest.JSON_PROPERTY_DATE,
-  FormatTest.JSON_PROPERTY_DATE_TIME,
-  FormatTest.JSON_PROPERTY_UUID,
-  FormatTest.JSON_PROPERTY_PASSWORD,
-  FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS,
-  FormatTest.JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER
-})
-
-public class FormatTest {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
-
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  private Integer int32;
-
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  private Long int64;
-
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  private BigDecimal number;
-
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  private Float _float;
-
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  private Double _double;
-
-  public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
-
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  private byte[] _byte;
-
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  private File binary;
-
-  public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_PATTERN_WITH_DIGITS = "pattern_with_digits";
-  private String patternWithDigits;
-
-  public static final String JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER = "pattern_with_digits_and_delimiter";
-  private String patternWithDigitsAndDelimiter;
-
-
-  public FormatTest integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * Get integer
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public FormatTest int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * Get int32
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public FormatTest int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * Get int64
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public FormatTest number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * Get number
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public FormatTest _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * Get _float
-   * minimum: 54.3
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public FormatTest _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * Get _double
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public FormatTest string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public FormatTest _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * Get _byte
-   * @return _byte
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public FormatTest binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * Get binary
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public FormatTest date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * Get date
-   * @return date
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public FormatTest uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public FormatTest password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public FormatTest patternWithDigits(String patternWithDigits) {
-    
-    this.patternWithDigits = patternWithDigits;
-    return this;
-  }
-
-   /**
-   * A string that is a 10 digit number. Can have leading zeros.
-   * @return patternWithDigits
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "A string that is a 10 digit number. Can have leading zeros.")
-  @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPatternWithDigits() {
-    return patternWithDigits;
-  }
-
-
-  public void setPatternWithDigits(String patternWithDigits) {
-    this.patternWithDigits = patternWithDigits;
-  }
-
-
-  public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelimiter) {
-    
-    this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
-    return this;
-  }
-
-   /**
-   * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
-   * @return patternWithDigitsAndDelimiter
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.")
-  @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPatternWithDigitsAndDelimiter() {
-    return patternWithDigitsAndDelimiter;
-  }
-
-
-  public void setPatternWithDigitsAndDelimiter(String patternWithDigitsAndDelimiter) {
-    this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
-        Objects.equals(this.int32, formatTest.int32) &&
-        Objects.equals(this.int64, formatTest.int64) &&
-        Objects.equals(this.number, formatTest.number) &&
-        Objects.equals(this._float, formatTest._float) &&
-        Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
-        Arrays.equals(this._byte, formatTest._byte) &&
-        Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
-        Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
-        Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
-    sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
deleted file mode 100644
index a9eeee525b6..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Fruit.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Apple;
-import org.openapitools.client.model.Banana;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Fruit.FruitDeserializer.class)
-public class Fruit extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Fruit.class.getName());
-
-    public static class FruitDeserializer extends StdDeserializer<Fruit> {
-        public FruitDeserializer() {
-            this(Fruit.class);
-        }
-
-        public FruitDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Fruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize Apple
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Apple.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Apple'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Apple'", e);
-            }
-
-            // deserialize Banana
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Banana.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Banana'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Banana'", e);
-            }
-
-            if (match == 1) {
-                Fruit ret = new Fruit();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Fruit: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Fruit() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Fruit(Apple o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Fruit(Banana o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Apple", new GenericType<Apple>() {
-        });
-        schemas.put("Banana", new GenericType<Banana>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Fruit.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Apple) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Banana) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Apple, Banana");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
deleted file mode 100644
index 2a46202a7ed..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FruitReq.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.openapitools.client.model.AppleReq;
-import org.openapitools.client.model.BananaReq;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=FruitReq.FruitReqDeserializer.class)
-public class FruitReq extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(FruitReq.class.getName());
-
-    public static class FruitReqDeserializer extends StdDeserializer<FruitReq> {
-        public FruitReqDeserializer() {
-            this(FruitReq.class);
-        }
-
-        public FruitReqDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public FruitReq deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize AppleReq
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(AppleReq.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'AppleReq'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'AppleReq'", e);
-            }
-
-            // deserialize BananaReq
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(BananaReq.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'BananaReq'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'BananaReq'", e);
-            }
-
-            if (match == 1) {
-                FruitReq ret = new FruitReq();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for FruitReq: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public FruitReq() {
-        super("oneOf", Boolean.TRUE);
-    }
-
-    public FruitReq(AppleReq o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    public FruitReq(BananaReq o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("AppleReq", new GenericType<AppleReq>() {
-        });
-        schemas.put("BananaReq", new GenericType<BananaReq>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return FruitReq.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof AppleReq) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof BananaReq) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be AppleReq, BananaReq");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
deleted file mode 100644
index 6dd57e7c3a5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GmFruit.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import org.openapitools.client.model.Apple;
-import org.openapitools.client.model.Banana;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=GmFruit.GmFruitDeserializer.class)
-public class GmFruit extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(GmFruit.class.getName());
-
-    public static class GmFruitDeserializer extends StdDeserializer<GmFruit> {
-        public GmFruitDeserializer() {
-            this(GmFruit.class);
-        }
-
-        public GmFruitDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public GmFruit deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            Object deserialized = null;
-            // deserialzie Apple
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Apple.class);
-                GmFruit ret = new GmFruit();
-                ret.setActualInstance(deserialized);
-                return ret;
-            } catch (Exception e) {
-                // deserialization failed, continue, log to help debugging
-                log.log(Level.FINER, "Input data does not match 'GmFruit'", e);
-            }
-
-            // deserialzie Banana
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Banana.class);
-                GmFruit ret = new GmFruit();
-                ret.setActualInstance(deserialized);
-                return ret;
-            } catch (Exception e) {
-                // deserialization failed, continue, log to help debugging
-                log.log(Level.FINER, "Input data does not match 'GmFruit'", e);
-            }
-
-            throw new IOException(String.format("Failed deserialization for GmFruit: no match found"));
-        }
-    }
-
-    // store a list of schema names defined in anyOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public GmFruit() {
-        super("anyOf", Boolean.FALSE);
-    }
-
-    public GmFruit(Apple o) {
-        super("anyOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public GmFruit(Banana o) {
-        super("anyOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Apple", new GenericType<Apple>() {
-        });
-        schemas.put("Banana", new GenericType<Banana>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return GmFruit.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Apple) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Banana) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Apple, Banana");
-    }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
deleted file mode 100644
index 18f7c9f55be..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ChildCat;
-import org.openapitools.client.model.ParentPet;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * GrandparentAnimal
- */
-@JsonPropertyOrder({
-  GrandparentAnimal.JSON_PROPERTY_PET_TYPE
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = ChildCat.class, name = "ChildCat"),
-  @JsonSubTypes.Type(value = ParentPet.class, name = "ParentPet"),
-})
-
-public class GrandparentAnimal {
-  public static final String JSON_PROPERTY_PET_TYPE = "pet_type";
-  private String petType;
-
-
-  public GrandparentAnimal petType(String petType) {
-    
-    this.petType = petType;
-    return this;
-  }
-
-   /**
-   * Get petType
-   * @return petType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PET_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPetType() {
-    return petType;
-  }
-
-
-  public void setPetType(String petType) {
-    this.petType = petType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    GrandparentAnimal grandparentAnimal = (GrandparentAnimal) o;
-    return Objects.equals(this.petType, grandparentAnimal.petType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(petType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class GrandparentAnimal {\n");
-    sb.append("    petType: ").append(toIndentedString(petType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
deleted file mode 100644
index 0a3f0d46436..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * HasOnlyReadOnly
- */
-@JsonPropertyOrder({
-  HasOnlyReadOnly.JSON_PROPERTY_BAR,
-  HasOnlyReadOnly.JSON_PROPERTY_FOO
-})
-
-public class HasOnlyReadOnly {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_FOO = "foo";
-  private String foo;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-   /**
-   * Get foo
-   * @return foo
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FOO)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFoo() {
-    return foo;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
-    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
-        Objects.equals(this.foo, hasOnlyReadOnly.foo);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, foo);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HasOnlyReadOnly {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    foo: ").append(toIndentedString(foo)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
deleted file mode 100644
index efb77061df1..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.
- */
-@ApiModel(description = "Just a string to inform instance is up and running. Make it nullable in hope to get it as pointer in generated model.")
-@JsonPropertyOrder({
-  HealthCheckResult.JSON_PROPERTY_NULLABLE_MESSAGE
-})
-
-public class HealthCheckResult {
-  public static final String JSON_PROPERTY_NULLABLE_MESSAGE = "NullableMessage";
-  private JsonNullable<String> nullableMessage = JsonNullable.<String>undefined();
-
-
-  public HealthCheckResult nullableMessage(String nullableMessage) {
-    this.nullableMessage = JsonNullable.<String>of(nullableMessage);
-    
-    return this;
-  }
-
-   /**
-   * Get nullableMessage
-   * @return nullableMessage
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public String getNullableMessage() {
-        return nullableMessage.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<String> getNullableMessage_JsonNullable() {
-    return nullableMessage;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE)
-  public void setNullableMessage_JsonNullable(JsonNullable<String> nullableMessage) {
-    this.nullableMessage = nullableMessage;
-  }
-
-  public void setNullableMessage(String nullableMessage) {
-    this.nullableMessage = JsonNullable.<String>of(nullableMessage);
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    HealthCheckResult healthCheckResult = (HealthCheckResult) o;
-    return Objects.equals(this.nullableMessage, healthCheckResult.nullableMessage);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(nullableMessage);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class HealthCheckResult {\n");
-    sb.append("    nullableMessage: ").append(toIndentedString(nullableMessage)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
deleted file mode 100644
index bb0804c5240..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject
- */
-@JsonPropertyOrder({
-  InlineObject.JSON_PROPERTY_NAME,
-  InlineObject.JSON_PROPERTY_STATUS
-})
-
-public class InlineObject {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private String status;
-
-
-  public InlineObject name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Updated name of the pet
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Updated name of the pet")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public InlineObject status(String status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Updated status of the pet
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Updated status of the pet")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(String status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject inlineObject = (InlineObject) o;
-    return Objects.equals(this.name, inlineObject.name) &&
-        Objects.equals(this.status, inlineObject.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
deleted file mode 100644
index 99b98f4c848..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject1.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject1
- */
-@JsonPropertyOrder({
-  InlineObject1.JSON_PROPERTY_ADDITIONAL_METADATA,
-  InlineObject1.JSON_PROPERTY_FILE
-})
-
-public class InlineObject1 {
-  public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
-  private String additionalMetadata;
-
-  public static final String JSON_PROPERTY_FILE = "file";
-  private File file;
-
-
-  public InlineObject1 additionalMetadata(String additionalMetadata) {
-    
-    this.additionalMetadata = additionalMetadata;
-    return this;
-  }
-
-   /**
-   * Additional data to pass to server
-   * @return additionalMetadata
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Additional data to pass to server")
-  @JsonProperty(JSON_PROPERTY_ADDITIONAL_METADATA)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getAdditionalMetadata() {
-    return additionalMetadata;
-  }
-
-
-  public void setAdditionalMetadata(String additionalMetadata) {
-    this.additionalMetadata = additionalMetadata;
-  }
-
-
-  public InlineObject1 file(File file) {
-    
-    this.file = file;
-    return this;
-  }
-
-   /**
-   * file to upload
-   * @return file
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "file to upload")
-  @JsonProperty(JSON_PROPERTY_FILE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getFile() {
-    return file;
-  }
-
-
-  public void setFile(File file) {
-    this.file = file;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject1 inlineObject1 = (InlineObject1) o;
-    return Objects.equals(this.additionalMetadata, inlineObject1.additionalMetadata) &&
-        Objects.equals(this.file, inlineObject1.file);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(additionalMetadata, file);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject1 {\n");
-    sb.append("    additionalMetadata: ").append(toIndentedString(additionalMetadata)).append("\n");
-    sb.append("    file: ").append(toIndentedString(file)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
deleted file mode 100644
index 468545bb342..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject2.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject2
- */
-@JsonPropertyOrder({
-  InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING_ARRAY,
-  InlineObject2.JSON_PROPERTY_ENUM_FORM_STRING
-})
-
-public class InlineObject2 {
-  /**
-   * Gets or Sets enumFormStringArray
-   */
-  public enum EnumFormStringArrayEnum {
-    GREATER_THAN(">"),
-    
-    DOLLAR("$");
-
-    private String value;
-
-    EnumFormStringArrayEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumFormStringArrayEnum fromValue(String value) {
-      for (EnumFormStringArrayEnum b : EnumFormStringArrayEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_FORM_STRING_ARRAY = "enum_form_string_array";
-  private List<EnumFormStringArrayEnum> enumFormStringArray = null;
-
-  /**
-   * Form parameter enum test (string)
-   */
-  public enum EnumFormStringEnum {
-    _ABC("_abc"),
-    
-    _EFG("-efg"),
-    
-    _XYZ_("(xyz)");
-
-    private String value;
-
-    EnumFormStringEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static EnumFormStringEnum fromValue(String value) {
-      for (EnumFormStringEnum b : EnumFormStringEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_ENUM_FORM_STRING = "enum_form_string";
-  private EnumFormStringEnum enumFormString = EnumFormStringEnum._EFG;
-
-
-  public InlineObject2 enumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringArray) {
-    
-    this.enumFormStringArray = enumFormStringArray;
-    return this;
-  }
-
-  public InlineObject2 addEnumFormStringArrayItem(EnumFormStringArrayEnum enumFormStringArrayItem) {
-    if (this.enumFormStringArray == null) {
-      this.enumFormStringArray = new ArrayList<>();
-    }
-    this.enumFormStringArray.add(enumFormStringArrayItem);
-    return this;
-  }
-
-   /**
-   * Form parameter enum test (string array)
-   * @return enumFormStringArray
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Form parameter enum test (string array)")
-  @JsonProperty(JSON_PROPERTY_ENUM_FORM_STRING_ARRAY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<EnumFormStringArrayEnum> getEnumFormStringArray() {
-    return enumFormStringArray;
-  }
-
-
-  public void setEnumFormStringArray(List<EnumFormStringArrayEnum> enumFormStringArray) {
-    this.enumFormStringArray = enumFormStringArray;
-  }
-
-
-  public InlineObject2 enumFormString(EnumFormStringEnum enumFormString) {
-    
-    this.enumFormString = enumFormString;
-    return this;
-  }
-
-   /**
-   * Form parameter enum test (string)
-   * @return enumFormString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Form parameter enum test (string)")
-  @JsonProperty(JSON_PROPERTY_ENUM_FORM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public EnumFormStringEnum getEnumFormString() {
-    return enumFormString;
-  }
-
-
-  public void setEnumFormString(EnumFormStringEnum enumFormString) {
-    this.enumFormString = enumFormString;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject2 inlineObject2 = (InlineObject2) o;
-    return Objects.equals(this.enumFormStringArray, inlineObject2.enumFormStringArray) &&
-        Objects.equals(this.enumFormString, inlineObject2.enumFormString);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(enumFormStringArray, enumFormString);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject2 {\n");
-    sb.append("    enumFormStringArray: ").append(toIndentedString(enumFormStringArray)).append("\n");
-    sb.append("    enumFormString: ").append(toIndentedString(enumFormString)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
deleted file mode 100644
index ed083c6ab53..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject3.java
+++ /dev/null
@@ -1,514 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject3
- */
-@JsonPropertyOrder({
-  InlineObject3.JSON_PROPERTY_INTEGER,
-  InlineObject3.JSON_PROPERTY_INT32,
-  InlineObject3.JSON_PROPERTY_INT64,
-  InlineObject3.JSON_PROPERTY_NUMBER,
-  InlineObject3.JSON_PROPERTY_FLOAT,
-  InlineObject3.JSON_PROPERTY_DOUBLE,
-  InlineObject3.JSON_PROPERTY_STRING,
-  InlineObject3.JSON_PROPERTY_PATTERN_WITHOUT_DELIMITER,
-  InlineObject3.JSON_PROPERTY_BYTE,
-  InlineObject3.JSON_PROPERTY_BINARY,
-  InlineObject3.JSON_PROPERTY_DATE,
-  InlineObject3.JSON_PROPERTY_DATE_TIME,
-  InlineObject3.JSON_PROPERTY_PASSWORD,
-  InlineObject3.JSON_PROPERTY_CALLBACK
-})
-
-public class InlineObject3 {
-  public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
-
-  public static final String JSON_PROPERTY_INT32 = "int32";
-  private Integer int32;
-
-  public static final String JSON_PROPERTY_INT64 = "int64";
-  private Long int64;
-
-  public static final String JSON_PROPERTY_NUMBER = "number";
-  private BigDecimal number;
-
-  public static final String JSON_PROPERTY_FLOAT = "float";
-  private Float _float;
-
-  public static final String JSON_PROPERTY_DOUBLE = "double";
-  private Double _double;
-
-  public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
-
-  public static final String JSON_PROPERTY_PATTERN_WITHOUT_DELIMITER = "pattern_without_delimiter";
-  private String patternWithoutDelimiter;
-
-  public static final String JSON_PROPERTY_BYTE = "byte";
-  private byte[] _byte;
-
-  public static final String JSON_PROPERTY_BINARY = "binary";
-  private File binary;
-
-  public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_CALLBACK = "callback";
-  private String callback;
-
-
-  public InlineObject3 integer(Integer integer) {
-    
-    this.integer = integer;
-    return this;
-  }
-
-   /**
-   * None
-   * minimum: 10
-   * maximum: 100
-   * @return integer
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_INTEGER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInteger() {
-    return integer;
-  }
-
-
-  public void setInteger(Integer integer) {
-    this.integer = integer;
-  }
-
-
-  public InlineObject3 int32(Integer int32) {
-    
-    this.int32 = int32;
-    return this;
-  }
-
-   /**
-   * None
-   * minimum: 20
-   * maximum: 200
-   * @return int32
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_INT32)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getInt32() {
-    return int32;
-  }
-
-
-  public void setInt32(Integer int32) {
-    this.int32 = int32;
-  }
-
-
-  public InlineObject3 int64(Long int64) {
-    
-    this.int64 = int64;
-    return this;
-  }
-
-   /**
-   * None
-   * @return int64
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_INT64)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getInt64() {
-    return int64;
-  }
-
-
-  public void setInt64(Long int64) {
-    this.int64 = int64;
-  }
-
-
-  public InlineObject3 number(BigDecimal number) {
-    
-    this.number = number;
-    return this;
-  }
-
-   /**
-   * None
-   * minimum: 32.1
-   * maximum: 543.2
-   * @return number
-  **/
-  @ApiModelProperty(required = true, value = "None")
-  @JsonProperty(JSON_PROPERTY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public BigDecimal getNumber() {
-    return number;
-  }
-
-
-  public void setNumber(BigDecimal number) {
-    this.number = number;
-  }
-
-
-  public InlineObject3 _float(Float _float) {
-    
-    this._float = _float;
-    return this;
-  }
-
-   /**
-   * None
-   * maximum: 987.6
-   * @return _float
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_FLOAT)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Float getFloat() {
-    return _float;
-  }
-
-
-  public void setFloat(Float _float) {
-    this._float = _float;
-  }
-
-
-  public InlineObject3 _double(Double _double) {
-    
-    this._double = _double;
-    return this;
-  }
-
-   /**
-   * None
-   * minimum: 67.8
-   * maximum: 123.4
-   * @return _double
-  **/
-  @ApiModelProperty(required = true, value = "None")
-  @JsonProperty(JSON_PROPERTY_DOUBLE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Double getDouble() {
-    return _double;
-  }
-
-
-  public void setDouble(Double _double) {
-    this._double = _double;
-  }
-
-
-  public InlineObject3 string(String string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * None
-   * @return string
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getString() {
-    return string;
-  }
-
-
-  public void setString(String string) {
-    this.string = string;
-  }
-
-
-  public InlineObject3 patternWithoutDelimiter(String patternWithoutDelimiter) {
-    
-    this.patternWithoutDelimiter = patternWithoutDelimiter;
-    return this;
-  }
-
-   /**
-   * None
-   * @return patternWithoutDelimiter
-  **/
-  @ApiModelProperty(required = true, value = "None")
-  @JsonProperty(JSON_PROPERTY_PATTERN_WITHOUT_DELIMITER)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getPatternWithoutDelimiter() {
-    return patternWithoutDelimiter;
-  }
-
-
-  public void setPatternWithoutDelimiter(String patternWithoutDelimiter) {
-    this.patternWithoutDelimiter = patternWithoutDelimiter;
-  }
-
-
-  public InlineObject3 _byte(byte[] _byte) {
-    
-    this._byte = _byte;
-    return this;
-  }
-
-   /**
-   * None
-   * @return _byte
-  **/
-  @ApiModelProperty(required = true, value = "None")
-  @JsonProperty(JSON_PROPERTY_BYTE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public byte[] getByte() {
-    return _byte;
-  }
-
-
-  public void setByte(byte[] _byte) {
-    this._byte = _byte;
-  }
-
-
-  public InlineObject3 binary(File binary) {
-    
-    this.binary = binary;
-    return this;
-  }
-
-   /**
-   * None
-   * @return binary
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_BINARY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public File getBinary() {
-    return binary;
-  }
-
-
-  public void setBinary(File binary) {
-    this.binary = binary;
-  }
-
-
-  public InlineObject3 date(LocalDate date) {
-    
-    this.date = date;
-    return this;
-  }
-
-   /**
-   * None
-   * @return date
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public LocalDate getDate() {
-    return date;
-  }
-
-
-  public void setDate(LocalDate date) {
-    this.date = date;
-  }
-
-
-  public InlineObject3 dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * None
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public InlineObject3 password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * None
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public InlineObject3 callback(String callback) {
-    
-    this.callback = callback;
-    return this;
-  }
-
-   /**
-   * None
-   * @return callback
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "None")
-  @JsonProperty(JSON_PROPERTY_CALLBACK)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getCallback() {
-    return callback;
-  }
-
-
-  public void setCallback(String callback) {
-    this.callback = callback;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject3 inlineObject3 = (InlineObject3) o;
-    return Objects.equals(this.integer, inlineObject3.integer) &&
-        Objects.equals(this.int32, inlineObject3.int32) &&
-        Objects.equals(this.int64, inlineObject3.int64) &&
-        Objects.equals(this.number, inlineObject3.number) &&
-        Objects.equals(this._float, inlineObject3._float) &&
-        Objects.equals(this._double, inlineObject3._double) &&
-        Objects.equals(this.string, inlineObject3.string) &&
-        Objects.equals(this.patternWithoutDelimiter, inlineObject3.patternWithoutDelimiter) &&
-        Arrays.equals(this._byte, inlineObject3._byte) &&
-        Objects.equals(this.binary, inlineObject3.binary) &&
-        Objects.equals(this.date, inlineObject3.date) &&
-        Objects.equals(this.dateTime, inlineObject3.dateTime) &&
-        Objects.equals(this.password, inlineObject3.password) &&
-        Objects.equals(this.callback, inlineObject3.callback);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, patternWithoutDelimiter, Arrays.hashCode(_byte), binary, date, dateTime, password, callback);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject3 {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
-    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
-    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
-    sb.append("    number: ").append(toIndentedString(number)).append("\n");
-    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
-    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
-    sb.append("    patternWithoutDelimiter: ").append(toIndentedString(patternWithoutDelimiter)).append("\n");
-    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
-    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    callback: ").append(toIndentedString(callback)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
deleted file mode 100644
index 953ca1d5b2b..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject4.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject4
- */
-@JsonPropertyOrder({
-  InlineObject4.JSON_PROPERTY_PARAM,
-  InlineObject4.JSON_PROPERTY_PARAM2
-})
-
-public class InlineObject4 {
-  public static final String JSON_PROPERTY_PARAM = "param";
-  private String param;
-
-  public static final String JSON_PROPERTY_PARAM2 = "param2";
-  private String param2;
-
-
-  public InlineObject4 param(String param) {
-    
-    this.param = param;
-    return this;
-  }
-
-   /**
-   * field1
-   * @return param
-  **/
-  @ApiModelProperty(required = true, value = "field1")
-  @JsonProperty(JSON_PROPERTY_PARAM)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getParam() {
-    return param;
-  }
-
-
-  public void setParam(String param) {
-    this.param = param;
-  }
-
-
-  public InlineObject4 param2(String param2) {
-    
-    this.param2 = param2;
-    return this;
-  }
-
-   /**
-   * field2
-   * @return param2
-  **/
-  @ApiModelProperty(required = true, value = "field2")
-  @JsonProperty(JSON_PROPERTY_PARAM2)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getParam2() {
-    return param2;
-  }
-
-
-  public void setParam2(String param2) {
-    this.param2 = param2;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject4 inlineObject4 = (InlineObject4) o;
-    return Objects.equals(this.param, inlineObject4.param) &&
-        Objects.equals(this.param2, inlineObject4.param2);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(param, param2);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject4 {\n");
-    sb.append("    param: ").append(toIndentedString(param)).append("\n");
-    sb.append("    param2: ").append(toIndentedString(param2)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
deleted file mode 100644
index 1b079adfcf9..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineObject5.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.File;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineObject5
- */
-@JsonPropertyOrder({
-  InlineObject5.JSON_PROPERTY_ADDITIONAL_METADATA,
-  InlineObject5.JSON_PROPERTY_REQUIRED_FILE
-})
-
-public class InlineObject5 {
-  public static final String JSON_PROPERTY_ADDITIONAL_METADATA = "additionalMetadata";
-  private String additionalMetadata;
-
-  public static final String JSON_PROPERTY_REQUIRED_FILE = "requiredFile";
-  private File requiredFile;
-
-
-  public InlineObject5 additionalMetadata(String additionalMetadata) {
-    
-    this.additionalMetadata = additionalMetadata;
-    return this;
-  }
-
-   /**
-   * Additional data to pass to server
-   * @return additionalMetadata
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Additional data to pass to server")
-  @JsonProperty(JSON_PROPERTY_ADDITIONAL_METADATA)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getAdditionalMetadata() {
-    return additionalMetadata;
-  }
-
-
-  public void setAdditionalMetadata(String additionalMetadata) {
-    this.additionalMetadata = additionalMetadata;
-  }
-
-
-  public InlineObject5 requiredFile(File requiredFile) {
-    
-    this.requiredFile = requiredFile;
-    return this;
-  }
-
-   /**
-   * file to upload
-   * @return requiredFile
-  **/
-  @ApiModelProperty(required = true, value = "file to upload")
-  @JsonProperty(JSON_PROPERTY_REQUIRED_FILE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public File getRequiredFile() {
-    return requiredFile;
-  }
-
-
-  public void setRequiredFile(File requiredFile) {
-    this.requiredFile = requiredFile;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineObject5 inlineObject5 = (InlineObject5) o;
-    return Objects.equals(this.additionalMetadata, inlineObject5.additionalMetadata) &&
-        Objects.equals(this.requiredFile, inlineObject5.requiredFile);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(additionalMetadata, requiredFile);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineObject5 {\n");
-    sb.append("    additionalMetadata: ").append(toIndentedString(additionalMetadata)).append("\n");
-    sb.append("    requiredFile: ").append(toIndentedString(requiredFile)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
deleted file mode 100644
index 6b90bf2a18f..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/InlineResponseDefault.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Foo;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * InlineResponseDefault
- */
-@JsonPropertyOrder({
-  InlineResponseDefault.JSON_PROPERTY_STRING
-})
-
-public class InlineResponseDefault {
-  public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
-
-
-  public InlineResponseDefault string(Foo string) {
-    
-    this.string = string;
-    return this;
-  }
-
-   /**
-   * Get string
-   * @return string
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Foo getString() {
-    return string;
-  }
-
-
-  public void setString(Foo string) {
-    this.string = string;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    InlineResponseDefault inlineResponseDefault = (InlineResponseDefault) o;
-    return Objects.equals(this.string, inlineResponseDefault.string);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(string);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineResponseDefault {\n");
-    sb.append("    string: ").append(toIndentedString(string)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
deleted file mode 100644
index 6282304a20b..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ShapeInterface;
-import org.openapitools.client.model.TriangleInterface;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * IsoscelesTriangle
- */
-@JsonPropertyOrder({
-  IsoscelesTriangle.JSON_PROPERTY_SHAPE_TYPE,
-  IsoscelesTriangle.JSON_PROPERTY_TRIANGLE_TYPE
-})
-
-public class IsoscelesTriangle {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-  public static final String JSON_PROPERTY_TRIANGLE_TYPE = "triangleType";
-  private String triangleType;
-
-
-  public IsoscelesTriangle shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  public IsoscelesTriangle triangleType(String triangleType) {
-    
-    this.triangleType = triangleType;
-    return this;
-  }
-
-   /**
-   * Get triangleType
-   * @return triangleType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getTriangleType() {
-    return triangleType;
-  }
-
-
-  public void setTriangleType(String triangleType) {
-    this.triangleType = triangleType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    IsoscelesTriangle isoscelesTriangle = (IsoscelesTriangle) o;
-    return Objects.equals(this.shapeType, isoscelesTriangle.shapeType) &&
-        Objects.equals(this.triangleType, isoscelesTriangle.triangleType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType, triangleType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class IsoscelesTriangle {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
-    sb.append("    triangleType: ").append(toIndentedString(triangleType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
deleted file mode 100644
index dff6e3b29c0..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Mammal.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Pig;
-import org.openapitools.client.model.Whale;
-import org.openapitools.client.model.Zebra;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Mammal.MammalDeserializer.class)
-public class Mammal extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Mammal.class.getName());
-
-    public static class MammalDeserializer extends StdDeserializer<Mammal> {
-        public MammalDeserializer() {
-            this(Mammal.class);
-        }
-
-        public MammalDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Mammal deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize Pig
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Pig.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Pig'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Pig'", e);
-            }
-
-            // deserialize Whale
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Whale.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Whale'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Whale'", e);
-            }
-
-            // deserialize Zebra
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Zebra.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Zebra'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Zebra'", e);
-            }
-
-            if (match == 1) {
-                Mammal ret = new Mammal();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Mammal: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Mammal() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Mammal(Pig o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Mammal(Whale o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Mammal(Zebra o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Pig", new GenericType<Pig>() {
-        });
-        schemas.put("Whale", new GenericType<Whale>() {
-        });
-        schemas.put("Zebra", new GenericType<Zebra>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Mammal.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Pig) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Whale) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Zebra) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Pig, Whale, Zebra");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
deleted file mode 100644
index 3e72350aa8b..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * MapTest
- */
-@JsonPropertyOrder({
-  MapTest.JSON_PROPERTY_MAP_MAP_OF_STRING,
-  MapTest.JSON_PROPERTY_MAP_OF_ENUM_STRING,
-  MapTest.JSON_PROPERTY_DIRECT_MAP,
-  MapTest.JSON_PROPERTY_INDIRECT_MAP
-})
-
-public class MapTest {
-  public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  private Map<String, Map<String, String>> mapMapOfString = null;
-
-  /**
-   * Gets or Sets inner
-   */
-  public enum InnerEnum {
-    UPPER("UPPER"),
-    
-    LOWER("lower");
-
-    private String value;
-
-    InnerEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static InnerEnum fromValue(String value) {
-      for (InnerEnum b : InnerEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  private Map<String, InnerEnum> mapOfEnumString = null;
-
-  public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  private Map<String, Boolean> directMap = null;
-
-  public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  private Map<String, Boolean> indirectMap = null;
-
-
-  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    
-    this.mapMapOfString = mapMapOfString;
-    return this;
-  }
-
-  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
-    if (this.mapMapOfString == null) {
-      this.mapMapOfString = new HashMap<>();
-    }
-    this.mapMapOfString.put(key, mapMapOfStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapMapOfString
-   * @return mapMapOfString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Map<String, String>> getMapMapOfString() {
-    return mapMapOfString;
-  }
-
-
-  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
-    this.mapMapOfString = mapMapOfString;
-  }
-
-
-  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    
-    this.mapOfEnumString = mapOfEnumString;
-    return this;
-  }
-
-  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
-    if (this.mapOfEnumString == null) {
-      this.mapOfEnumString = new HashMap<>();
-    }
-    this.mapOfEnumString.put(key, mapOfEnumStringItem);
-    return this;
-  }
-
-   /**
-   * Get mapOfEnumString
-   * @return mapOfEnumString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, InnerEnum> getMapOfEnumString() {
-    return mapOfEnumString;
-  }
-
-
-  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
-    this.mapOfEnumString = mapOfEnumString;
-  }
-
-
-  public MapTest directMap(Map<String, Boolean> directMap) {
-    
-    this.directMap = directMap;
-    return this;
-  }
-
-  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
-    if (this.directMap == null) {
-      this.directMap = new HashMap<>();
-    }
-    this.directMap.put(key, directMapItem);
-    return this;
-  }
-
-   /**
-   * Get directMap
-   * @return directMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getDirectMap() {
-    return directMap;
-  }
-
-
-  public void setDirectMap(Map<String, Boolean> directMap) {
-    this.directMap = directMap;
-  }
-
-
-  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
-    
-    this.indirectMap = indirectMap;
-    return this;
-  }
-
-  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
-    if (this.indirectMap == null) {
-      this.indirectMap = new HashMap<>();
-    }
-    this.indirectMap.put(key, indirectMapItem);
-    return this;
-  }
-
-   /**
-   * Get indirectMap
-   * @return indirectMap
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Boolean> getIndirectMap() {
-    return indirectMap;
-  }
-
-
-  public void setIndirectMap(Map<String, Boolean> indirectMap) {
-    this.indirectMap = indirectMap;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MapTest mapTest = (MapTest) o;
-    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
-        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
-        Objects.equals(this.directMap, mapTest.directMap) &&
-        Objects.equals(this.indirectMap, mapTest.indirectMap);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MapTest {\n");
-    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
-    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
-    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
-    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
deleted file mode 100644
index 07d314691a9..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import org.openapitools.client.model.Animal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * MixedPropertiesAndAdditionalPropertiesClass
- */
-@JsonPropertyOrder({
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_UUID,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_DATE_TIME,
-  MixedPropertiesAndAdditionalPropertiesClass.JSON_PROPERTY_MAP
-})
-
-public class MixedPropertiesAndAdditionalPropertiesClass {
-  public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
-
-  public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
-
-  public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = null;
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    
-    this.uuid = uuid;
-    return this;
-  }
-
-   /**
-   * Get uuid
-   * @return uuid
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_UUID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public UUID getUuid() {
-    return uuid;
-  }
-
-
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    
-    this.dateTime = dateTime;
-    return this;
-  }
-
-   /**
-   * Get dateTime
-   * @return dateTime
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getDateTime() {
-    return dateTime;
-  }
-
-
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
-  }
-
-
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    
-    this.map = map;
-    return this;
-  }
-
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
-    }
-    this.map.put(key, mapItem);
-    return this;
-  }
-
-   /**
-   * Get map
-   * @return map
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MAP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Animal> getMap() {
-    return map;
-  }
-
-
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
deleted file mode 100644
index dd99468a005..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model name starting with number
- */
-@ApiModel(description = "Model for testing model name starting with number")
-@JsonPropertyOrder({
-  Model200Response.JSON_PROPERTY_NAME,
-  Model200Response.JSON_PROPERTY_PROPERTY_CLASS
-})
-
-public class Model200Response {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_PROPERTY_CLASS = "class";
-  private String propertyClass;
-
-
-  public Model200Response name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-  public Model200Response propertyClass(String propertyClass) {
-    
-    this.propertyClass = propertyClass;
-    return this;
-  }
-
-   /**
-   * Get propertyClass
-   * @return propertyClass
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPropertyClass() {
-    return propertyClass;
-  }
-
-
-  public void setPropertyClass(String propertyClass) {
-    this.propertyClass = propertyClass;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Model200Response _200response = (Model200Response) o;
-    return Objects.equals(this.name, _200response.name) &&
-        Objects.equals(this.propertyClass, _200response.propertyClass);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, propertyClass);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Model200Response {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
deleted file mode 100644
index 383cafdd3a5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ModelApiResponse
- */
-@JsonPropertyOrder({
-  ModelApiResponse.JSON_PROPERTY_CODE,
-  ModelApiResponse.JSON_PROPERTY_TYPE,
-  ModelApiResponse.JSON_PROPERTY_MESSAGE
-})
-
-public class ModelApiResponse {
-  public static final String JSON_PROPERTY_CODE = "code";
-  private Integer code;
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private String type;
-
-  public static final String JSON_PROPERTY_MESSAGE = "message";
-  private String message;
-
-
-  public ModelApiResponse code(Integer code) {
-    
-    this.code = code;
-    return this;
-  }
-
-   /**
-   * Get code
-   * @return code
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CODE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getCode() {
-    return code;
-  }
-
-
-  public void setCode(Integer code) {
-    this.code = code;
-  }
-
-
-  public ModelApiResponse type(String type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getType() {
-    return type;
-  }
-
-
-  public void setType(String type) {
-    this.type = type;
-  }
-
-
-  public ModelApiResponse message(String message) {
-    
-    this.message = message;
-    return this;
-  }
-
-   /**
-   * Get message
-   * @return message
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MESSAGE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMessage() {
-    return message;
-  }
-
-
-  public void setMessage(String message) {
-    this.message = message;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelApiResponse _apiResponse = (ModelApiResponse) o;
-    return Objects.equals(this.code, _apiResponse.code) &&
-        Objects.equals(this.type, _apiResponse.type) &&
-        Objects.equals(this.message, _apiResponse.message);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(code, type, message);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelApiResponse {\n");
-    sb.append("    code: ").append(toIndentedString(code)).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    message: ").append(toIndentedString(message)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
deleted file mode 100644
index b62e13a90a0..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing reserved words
- */
-@ApiModel(description = "Model for testing reserved words")
-@JsonPropertyOrder({
-  ModelReturn.JSON_PROPERTY_RETURN
-})
-
-public class ModelReturn {
-  public static final String JSON_PROPERTY_RETURN = "return";
-  private Integer _return;
-
-
-  public ModelReturn _return(Integer _return) {
-    
-    this._return = _return;
-    return this;
-  }
-
-   /**
-   * Get _return
-   * @return _return
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_RETURN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getReturn() {
-    return _return;
-  }
-
-
-  public void setReturn(Integer _return) {
-    this._return = _return;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ModelReturn _return = (ModelReturn) o;
-    return Objects.equals(this._return, _return._return);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_return);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ModelReturn {\n");
-    sb.append("    _return: ").append(toIndentedString(_return)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
deleted file mode 100644
index bd625c5f66f..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Model for testing model name same as property name
- */
-@ApiModel(description = "Model for testing model name same as property name")
-@JsonPropertyOrder({
-  Name.JSON_PROPERTY_NAME,
-  Name.JSON_PROPERTY_SNAKE_CASE,
-  Name.JSON_PROPERTY_PROPERTY,
-  Name.JSON_PROPERTY_123NUMBER
-})
-
-public class Name {
-  public static final String JSON_PROPERTY_NAME = "name";
-  private Integer name;
-
-  public static final String JSON_PROPERTY_SNAKE_CASE = "snake_case";
-  private Integer snakeCase;
-
-  public static final String JSON_PROPERTY_PROPERTY = "property";
-  private String property;
-
-  public static final String JSON_PROPERTY_123NUMBER = "123Number";
-  private Integer _123number;
-
-
-  public Name name(Integer name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public Integer getName() {
-    return name;
-  }
-
-
-  public void setName(Integer name) {
-    this.name = name;
-  }
-
-
-   /**
-   * Get snakeCase
-   * @return snakeCase
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getSnakeCase() {
-    return snakeCase;
-  }
-
-
-
-
-  public Name property(String property) {
-    
-    this.property = property;
-    return this;
-  }
-
-   /**
-   * Get property
-   * @return property
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PROPERTY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getProperty() {
-    return property;
-  }
-
-
-  public void setProperty(String property) {
-    this.property = property;
-  }
-
-
-   /**
-   * Get _123number
-   * @return _123number
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_123NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer get123number() {
-    return _123number;
-  }
-
-
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Name name = (Name) o;
-    return Objects.equals(this.name, name.name) &&
-        Objects.equals(this.snakeCase, name.snakeCase) &&
-        Objects.equals(this.property, name.property) &&
-        Objects.equals(this._123number, name._123number);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(name, snakeCase, property, _123number);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Name {\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
-    sb.append("    property: ").append(toIndentedString(property)).append("\n");
-    sb.append("    _123number: ").append(toIndentedString(_123number)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
deleted file mode 100644
index 6ade4828624..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.OffsetDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * NullableClass
- */
-@JsonPropertyOrder({
-  NullableClass.JSON_PROPERTY_INTEGER_PROP,
-  NullableClass.JSON_PROPERTY_NUMBER_PROP,
-  NullableClass.JSON_PROPERTY_BOOLEAN_PROP,
-  NullableClass.JSON_PROPERTY_STRING_PROP,
-  NullableClass.JSON_PROPERTY_DATE_PROP,
-  NullableClass.JSON_PROPERTY_DATETIME_PROP,
-  NullableClass.JSON_PROPERTY_ARRAY_NULLABLE_PROP,
-  NullableClass.JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP,
-  NullableClass.JSON_PROPERTY_ARRAY_ITEMS_NULLABLE,
-  NullableClass.JSON_PROPERTY_OBJECT_NULLABLE_PROP,
-  NullableClass.JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP,
-  NullableClass.JSON_PROPERTY_OBJECT_ITEMS_NULLABLE
-})
-
-public class NullableClass extends HashMap<String, Object> {
-  public static final String JSON_PROPERTY_INTEGER_PROP = "integer_prop";
-  private JsonNullable<Integer> integerProp = JsonNullable.<Integer>undefined();
-
-  public static final String JSON_PROPERTY_NUMBER_PROP = "number_prop";
-  private JsonNullable<BigDecimal> numberProp = JsonNullable.<BigDecimal>undefined();
-
-  public static final String JSON_PROPERTY_BOOLEAN_PROP = "boolean_prop";
-  private JsonNullable<Boolean> booleanProp = JsonNullable.<Boolean>undefined();
-
-  public static final String JSON_PROPERTY_STRING_PROP = "string_prop";
-  private JsonNullable<String> stringProp = JsonNullable.<String>undefined();
-
-  public static final String JSON_PROPERTY_DATE_PROP = "date_prop";
-  private JsonNullable<LocalDate> dateProp = JsonNullable.<LocalDate>undefined();
-
-  public static final String JSON_PROPERTY_DATETIME_PROP = "datetime_prop";
-  private JsonNullable<OffsetDateTime> datetimeProp = JsonNullable.<OffsetDateTime>undefined();
-
-  public static final String JSON_PROPERTY_ARRAY_NULLABLE_PROP = "array_nullable_prop";
-  private JsonNullable<List<Object>> arrayNullableProp = JsonNullable.<List<Object>>undefined();
-
-  public static final String JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP = "array_and_items_nullable_prop";
-  private JsonNullable<List<Object>> arrayAndItemsNullableProp = JsonNullable.<List<Object>>undefined();
-
-  public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable";
-  private List<Object> arrayItemsNullable = null;
-
-  public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop";
-  private JsonNullable<Map<String, Object>> objectNullableProp = JsonNullable.<Map<String, Object>>undefined();
-
-  public static final String JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP = "object_and_items_nullable_prop";
-  private JsonNullable<Map<String, Object>> objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>undefined();
-
-  public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable";
-  private Map<String, Object> objectItemsNullable = null;
-
-
-  public NullableClass integerProp(Integer integerProp) {
-    this.integerProp = JsonNullable.<Integer>of(integerProp);
-    
-    return this;
-  }
-
-   /**
-   * Get integerProp
-   * @return integerProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public Integer getIntegerProp() {
-        return integerProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_INTEGER_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Integer> getIntegerProp_JsonNullable() {
-    return integerProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_INTEGER_PROP)
-  public void setIntegerProp_JsonNullable(JsonNullable<Integer> integerProp) {
-    this.integerProp = integerProp;
-  }
-
-  public void setIntegerProp(Integer integerProp) {
-    this.integerProp = JsonNullable.<Integer>of(integerProp);
-  }
-
-
-  public NullableClass numberProp(BigDecimal numberProp) {
-    this.numberProp = JsonNullable.<BigDecimal>of(numberProp);
-    
-    return this;
-  }
-
-   /**
-   * Get numberProp
-   * @return numberProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public BigDecimal getNumberProp() {
-        return numberProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_NUMBER_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<BigDecimal> getNumberProp_JsonNullable() {
-    return numberProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_NUMBER_PROP)
-  public void setNumberProp_JsonNullable(JsonNullable<BigDecimal> numberProp) {
-    this.numberProp = numberProp;
-  }
-
-  public void setNumberProp(BigDecimal numberProp) {
-    this.numberProp = JsonNullable.<BigDecimal>of(numberProp);
-  }
-
-
-  public NullableClass booleanProp(Boolean booleanProp) {
-    this.booleanProp = JsonNullable.<Boolean>of(booleanProp);
-    
-    return this;
-  }
-
-   /**
-   * Get booleanProp
-   * @return booleanProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public Boolean getBooleanProp() {
-        return booleanProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_BOOLEAN_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Boolean> getBooleanProp_JsonNullable() {
-    return booleanProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_BOOLEAN_PROP)
-  public void setBooleanProp_JsonNullable(JsonNullable<Boolean> booleanProp) {
-    this.booleanProp = booleanProp;
-  }
-
-  public void setBooleanProp(Boolean booleanProp) {
-    this.booleanProp = JsonNullable.<Boolean>of(booleanProp);
-  }
-
-
-  public NullableClass stringProp(String stringProp) {
-    this.stringProp = JsonNullable.<String>of(stringProp);
-    
-    return this;
-  }
-
-   /**
-   * Get stringProp
-   * @return stringProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public String getStringProp() {
-        return stringProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_STRING_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<String> getStringProp_JsonNullable() {
-    return stringProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_STRING_PROP)
-  public void setStringProp_JsonNullable(JsonNullable<String> stringProp) {
-    this.stringProp = stringProp;
-  }
-
-  public void setStringProp(String stringProp) {
-    this.stringProp = JsonNullable.<String>of(stringProp);
-  }
-
-
-  public NullableClass dateProp(LocalDate dateProp) {
-    this.dateProp = JsonNullable.<LocalDate>of(dateProp);
-    
-    return this;
-  }
-
-   /**
-   * Get dateProp
-   * @return dateProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public LocalDate getDateProp() {
-        return dateProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_DATE_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<LocalDate> getDateProp_JsonNullable() {
-    return dateProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_DATE_PROP)
-  public void setDateProp_JsonNullable(JsonNullable<LocalDate> dateProp) {
-    this.dateProp = dateProp;
-  }
-
-  public void setDateProp(LocalDate dateProp) {
-    this.dateProp = JsonNullable.<LocalDate>of(dateProp);
-  }
-
-
-  public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
-    this.datetimeProp = JsonNullable.<OffsetDateTime>of(datetimeProp);
-    
-    return this;
-  }
-
-   /**
-   * Get datetimeProp
-   * @return datetimeProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public OffsetDateTime getDatetimeProp() {
-        return datetimeProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_DATETIME_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<OffsetDateTime> getDatetimeProp_JsonNullable() {
-    return datetimeProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_DATETIME_PROP)
-  public void setDatetimeProp_JsonNullable(JsonNullable<OffsetDateTime> datetimeProp) {
-    this.datetimeProp = datetimeProp;
-  }
-
-  public void setDatetimeProp(OffsetDateTime datetimeProp) {
-    this.datetimeProp = JsonNullable.<OffsetDateTime>of(datetimeProp);
-  }
-
-
-  public NullableClass arrayNullableProp(List<Object> arrayNullableProp) {
-    this.arrayNullableProp = JsonNullable.<List<Object>>of(arrayNullableProp);
-    
-    return this;
-  }
-
-  public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
-    if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) {
-      this.arrayNullableProp = JsonNullable.<List<Object>>of(new ArrayList<>());
-    }
-    try {
-      this.arrayNullableProp.get().add(arrayNullablePropItem);
-    } catch (java.util.NoSuchElementException e) {
-      // this can never happen, as we make sure above that the value is present
-    }
-    return this;
-  }
-
-   /**
-   * Get arrayNullableProp
-   * @return arrayNullableProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public List<Object> getArrayNullableProp() {
-        return arrayNullableProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<List<Object>> getArrayNullableProp_JsonNullable() {
-    return arrayNullableProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP)
-  public void setArrayNullableProp_JsonNullable(JsonNullable<List<Object>> arrayNullableProp) {
-    this.arrayNullableProp = arrayNullableProp;
-  }
-
-  public void setArrayNullableProp(List<Object> arrayNullableProp) {
-    this.arrayNullableProp = JsonNullable.<List<Object>>of(arrayNullableProp);
-  }
-
-
-  public NullableClass arrayAndItemsNullableProp(List<Object> arrayAndItemsNullableProp) {
-    this.arrayAndItemsNullableProp = JsonNullable.<List<Object>>of(arrayAndItemsNullableProp);
-    
-    return this;
-  }
-
-  public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) {
-    if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) {
-      this.arrayAndItemsNullableProp = JsonNullable.<List<Object>>of(new ArrayList<>());
-    }
-    try {
-      this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem);
-    } catch (java.util.NoSuchElementException e) {
-      // this can never happen, as we make sure above that the value is present
-    }
-    return this;
-  }
-
-   /**
-   * Get arrayAndItemsNullableProp
-   * @return arrayAndItemsNullableProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public List<Object> getArrayAndItemsNullableProp() {
-        return arrayAndItemsNullableProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<List<Object>> getArrayAndItemsNullableProp_JsonNullable() {
-    return arrayAndItemsNullableProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP)
-  public void setArrayAndItemsNullableProp_JsonNullable(JsonNullable<List<Object>> arrayAndItemsNullableProp) {
-    this.arrayAndItemsNullableProp = arrayAndItemsNullableProp;
-  }
-
-  public void setArrayAndItemsNullableProp(List<Object> arrayAndItemsNullableProp) {
-    this.arrayAndItemsNullableProp = JsonNullable.<List<Object>>of(arrayAndItemsNullableProp);
-  }
-
-
-  public NullableClass arrayItemsNullable(List<Object> arrayItemsNullable) {
-    
-    this.arrayItemsNullable = arrayItemsNullable;
-    return this;
-  }
-
-  public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
-    if (this.arrayItemsNullable == null) {
-      this.arrayItemsNullable = new ArrayList<>();
-    }
-    this.arrayItemsNullable.add(arrayItemsNullableItem);
-    return this;
-  }
-
-   /**
-   * Get arrayItemsNullable
-   * @return arrayItemsNullable
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Object> getArrayItemsNullable() {
-    return arrayItemsNullable;
-  }
-
-
-  public void setArrayItemsNullable(List<Object> arrayItemsNullable) {
-    this.arrayItemsNullable = arrayItemsNullable;
-  }
-
-
-  public NullableClass objectNullableProp(Map<String, Object> objectNullableProp) {
-    this.objectNullableProp = JsonNullable.<Map<String, Object>>of(objectNullableProp);
-    
-    return this;
-  }
-
-  public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) {
-    if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) {
-      this.objectNullableProp = JsonNullable.<Map<String, Object>>of(new HashMap<>());
-    }
-    try {
-      this.objectNullableProp.get().put(key, objectNullablePropItem);
-    } catch (java.util.NoSuchElementException e) {
-      // this can never happen, as we make sure above that the value is present
-    }
-    return this;
-  }
-
-   /**
-   * Get objectNullableProp
-   * @return objectNullableProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public Map<String, Object> getObjectNullableProp() {
-        return objectNullableProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Map<String, Object>> getObjectNullableProp_JsonNullable() {
-    return objectNullableProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP)
-  public void setObjectNullableProp_JsonNullable(JsonNullable<Map<String, Object>> objectNullableProp) {
-    this.objectNullableProp = objectNullableProp;
-  }
-
-  public void setObjectNullableProp(Map<String, Object> objectNullableProp) {
-    this.objectNullableProp = JsonNullable.<Map<String, Object>>of(objectNullableProp);
-  }
-
-
-  public NullableClass objectAndItemsNullableProp(Map<String, Object> objectAndItemsNullableProp) {
-    this.objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>of(objectAndItemsNullableProp);
-    
-    return this;
-  }
-
-  public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) {
-    if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) {
-      this.objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>of(new HashMap<>());
-    }
-    try {
-      this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem);
-    } catch (java.util.NoSuchElementException e) {
-      // this can never happen, as we make sure above that the value is present
-    }
-    return this;
-  }
-
-   /**
-   * Get objectAndItemsNullableProp
-   * @return objectAndItemsNullableProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonIgnore
-
-  public Map<String, Object> getObjectAndItemsNullableProp() {
-        return objectAndItemsNullableProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP)
-  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Map<String, Object>> getObjectAndItemsNullableProp_JsonNullable() {
-    return objectAndItemsNullableProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP)
-  public void setObjectAndItemsNullableProp_JsonNullable(JsonNullable<Map<String, Object>> objectAndItemsNullableProp) {
-    this.objectAndItemsNullableProp = objectAndItemsNullableProp;
-  }
-
-  public void setObjectAndItemsNullableProp(Map<String, Object> objectAndItemsNullableProp) {
-    this.objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>of(objectAndItemsNullableProp);
-  }
-
-
-  public NullableClass objectItemsNullable(Map<String, Object> objectItemsNullable) {
-    
-    this.objectItemsNullable = objectItemsNullable;
-    return this;
-  }
-
-  public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNullableItem) {
-    if (this.objectItemsNullable == null) {
-      this.objectItemsNullable = new HashMap<>();
-    }
-    this.objectItemsNullable.put(key, objectItemsNullableItem);
-    return this;
-  }
-
-   /**
-   * Get objectItemsNullable
-   * @return objectItemsNullable
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
-  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Map<String, Object> getObjectItemsNullable() {
-    return objectItemsNullable;
-  }
-
-
-  public void setObjectItemsNullable(Map<String, Object> objectItemsNullable) {
-    this.objectItemsNullable = objectItemsNullable;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NullableClass nullableClass = (NullableClass) o;
-    return Objects.equals(this.integerProp, nullableClass.integerProp) &&
-        Objects.equals(this.numberProp, nullableClass.numberProp) &&
-        Objects.equals(this.booleanProp, nullableClass.booleanProp) &&
-        Objects.equals(this.stringProp, nullableClass.stringProp) &&
-        Objects.equals(this.dateProp, nullableClass.dateProp) &&
-        Objects.equals(this.datetimeProp, nullableClass.datetimeProp) &&
-        Objects.equals(this.arrayNullableProp, nullableClass.arrayNullableProp) &&
-        Objects.equals(this.arrayAndItemsNullableProp, nullableClass.arrayAndItemsNullableProp) &&
-        Objects.equals(this.arrayItemsNullable, nullableClass.arrayItemsNullable) &&
-        Objects.equals(this.objectNullableProp, nullableClass.objectNullableProp) &&
-        Objects.equals(this.objectAndItemsNullableProp, nullableClass.objectAndItemsNullableProp) &&
-        Objects.equals(this.objectItemsNullable, nullableClass.objectItemsNullable) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(integerProp, numberProp, booleanProp, stringProp, dateProp, datetimeProp, arrayNullableProp, arrayAndItemsNullableProp, arrayItemsNullable, objectNullableProp, objectAndItemsNullableProp, objectItemsNullable, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NullableClass {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    integerProp: ").append(toIndentedString(integerProp)).append("\n");
-    sb.append("    numberProp: ").append(toIndentedString(numberProp)).append("\n");
-    sb.append("    booleanProp: ").append(toIndentedString(booleanProp)).append("\n");
-    sb.append("    stringProp: ").append(toIndentedString(stringProp)).append("\n");
-    sb.append("    dateProp: ").append(toIndentedString(dateProp)).append("\n");
-    sb.append("    datetimeProp: ").append(toIndentedString(datetimeProp)).append("\n");
-    sb.append("    arrayNullableProp: ").append(toIndentedString(arrayNullableProp)).append("\n");
-    sb.append("    arrayAndItemsNullableProp: ").append(toIndentedString(arrayAndItemsNullableProp)).append("\n");
-    sb.append("    arrayItemsNullable: ").append(toIndentedString(arrayItemsNullable)).append("\n");
-    sb.append("    objectNullableProp: ").append(toIndentedString(objectNullableProp)).append("\n");
-    sb.append("    objectAndItemsNullableProp: ").append(toIndentedString(objectAndItemsNullableProp)).append("\n");
-    sb.append("    objectItemsNullable: ").append(toIndentedString(objectItemsNullable)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
deleted file mode 100644
index bdf4fc1dc38..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableShape.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Quadrilateral;
-import org.openapitools.client.model.Triangle;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=NullableShape.NullableShapeDeserializer.class)
-public class NullableShape extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(NullableShape.class.getName());
-
-    public static class NullableShapeDeserializer extends StdDeserializer<NullableShape> {
-        public NullableShapeDeserializer() {
-            this(NullableShape.class);
-        }
-
-        public NullableShapeDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public NullableShape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize Quadrilateral
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Quadrilateral'", e);
-            }
-
-            // deserialize Triangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Triangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Triangle'", e);
-            }
-
-            if (match == 1) {
-                NullableShape ret = new NullableShape();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for NullableShape: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public NullableShape() {
-        super("oneOf", Boolean.TRUE);
-    }
-
-    public NullableShape(Quadrilateral o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    public NullableShape(Triangle o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Quadrilateral", new GenericType<Quadrilateral>() {
-        });
-        schemas.put("Triangle", new GenericType<Triangle>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return NullableShape.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Triangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Quadrilateral, Triangle");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
deleted file mode 100644
index 5ca72a169fe..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * NumberOnly
- */
-@JsonPropertyOrder({
-  NumberOnly.JSON_PROPERTY_JUST_NUMBER
-})
-
-public class NumberOnly {
-  public static final String JSON_PROPERTY_JUST_NUMBER = "JustNumber";
-  private BigDecimal justNumber;
-
-
-  public NumberOnly justNumber(BigDecimal justNumber) {
-    
-    this.justNumber = justNumber;
-    return this;
-  }
-
-   /**
-   * Get justNumber
-   * @return justNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getJustNumber() {
-    return justNumber;
-  }
-
-
-  public void setJustNumber(BigDecimal justNumber) {
-    this.justNumber = justNumber;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    NumberOnly numberOnly = (NumberOnly) o;
-    return Objects.equals(this.justNumber, numberOnly.justNumber);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(justNumber);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class NumberOnly {\n");
-    sb.append("    justNumber: ").append(toIndentedString(justNumber)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
deleted file mode 100644
index ba4e395e94e..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.time.OffsetDateTime;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Order
- */
-@JsonPropertyOrder({
-  Order.JSON_PROPERTY_ID,
-  Order.JSON_PROPERTY_PET_ID,
-  Order.JSON_PROPERTY_QUANTITY,
-  Order.JSON_PROPERTY_SHIP_DATE,
-  Order.JSON_PROPERTY_STATUS,
-  Order.JSON_PROPERTY_COMPLETE
-})
-
-public class Order {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_PET_ID = "petId";
-  private Long petId;
-
-  public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  private Integer quantity;
-
-  public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  private OffsetDateTime shipDate;
-
-  /**
-   * Order Status
-   */
-  public enum StatusEnum {
-    PLACED("placed"),
-    
-    APPROVED("approved"),
-    
-    DELIVERED("delivered");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-  public static final String JSON_PROPERTY_COMPLETE = "complete";
-  private Boolean complete = false;
-
-
-  public Order id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Order petId(Long petId) {
-    
-    this.petId = petId;
-    return this;
-  }
-
-   /**
-   * Get petId
-   * @return petId
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PET_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getPetId() {
-    return petId;
-  }
-
-
-  public void setPetId(Long petId) {
-    this.petId = petId;
-  }
-
-
-  public Order quantity(Integer quantity) {
-    
-    this.quantity = quantity;
-    return this;
-  }
-
-   /**
-   * Get quantity
-   * @return quantity
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_QUANTITY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getQuantity() {
-    return quantity;
-  }
-
-
-  public void setQuantity(Integer quantity) {
-    this.quantity = quantity;
-  }
-
-
-  public Order shipDate(OffsetDateTime shipDate) {
-    
-    this.shipDate = shipDate;
-    return this;
-  }
-
-   /**
-   * Get shipDate
-   * @return shipDate
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_SHIP_DATE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public OffsetDateTime getShipDate() {
-    return shipDate;
-  }
-
-
-  public void setShipDate(OffsetDateTime shipDate) {
-    this.shipDate = shipDate;
-  }
-
-
-  public Order status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * Order Status
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "Order Status")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  public Order complete(Boolean complete) {
-    
-    this.complete = complete;
-    return this;
-  }
-
-   /**
-   * Get complete
-   * @return complete
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_COMPLETE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getComplete() {
-    return complete;
-  }
-
-
-  public void setComplete(Boolean complete) {
-    this.complete = complete;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Order order = (Order) o;
-    return Objects.equals(this.id, order.id) &&
-        Objects.equals(this.petId, order.petId) &&
-        Objects.equals(this.quantity, order.quantity) &&
-        Objects.equals(this.shipDate, order.shipDate) &&
-        Objects.equals(this.status, order.status) &&
-        Objects.equals(this.complete, order.complete);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, petId, quantity, shipDate, status, complete);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Order {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
-    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
-    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).append("\n");
-    sb.append("    complete: ").append(toIndentedString(complete)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
deleted file mode 100644
index d4d9ac6ba11..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.math.BigDecimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * OuterComposite
- */
-@JsonPropertyOrder({
-  OuterComposite.JSON_PROPERTY_MY_NUMBER,
-  OuterComposite.JSON_PROPERTY_MY_STRING,
-  OuterComposite.JSON_PROPERTY_MY_BOOLEAN
-})
-
-public class OuterComposite {
-  public static final String JSON_PROPERTY_MY_NUMBER = "my_number";
-  private BigDecimal myNumber;
-
-  public static final String JSON_PROPERTY_MY_STRING = "my_string";
-  private String myString;
-
-  public static final String JSON_PROPERTY_MY_BOOLEAN = "my_boolean";
-  private Boolean myBoolean;
-
-
-  public OuterComposite myNumber(BigDecimal myNumber) {
-    
-    this.myNumber = myNumber;
-    return this;
-  }
-
-   /**
-   * Get myNumber
-   * @return myNumber
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_NUMBER)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public BigDecimal getMyNumber() {
-    return myNumber;
-  }
-
-
-  public void setMyNumber(BigDecimal myNumber) {
-    this.myNumber = myNumber;
-  }
-
-
-  public OuterComposite myString(String myString) {
-    
-    this.myString = myString;
-    return this;
-  }
-
-   /**
-   * Get myString
-   * @return myString
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_STRING)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getMyString() {
-    return myString;
-  }
-
-
-  public void setMyString(String myString) {
-    this.myString = myString;
-  }
-
-
-  public OuterComposite myBoolean(Boolean myBoolean) {
-    
-    this.myBoolean = myBoolean;
-    return this;
-  }
-
-   /**
-   * Get myBoolean
-   * @return myBoolean
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getMyBoolean() {
-    return myBoolean;
-  }
-
-
-  public void setMyBoolean(Boolean myBoolean) {
-    this.myBoolean = myBoolean;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    OuterComposite outerComposite = (OuterComposite) o;
-    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
-        Objects.equals(this.myString, outerComposite.myString) &&
-        Objects.equals(this.myBoolean, outerComposite.myBoolean);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(myNumber, myString, myBoolean);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class OuterComposite {\n");
-    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
-    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
-    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
deleted file mode 100644
index d0c0bc3c9d2..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnum
- */
-public enum OuterEnum {
-  
-  PLACED("placed"),
-  
-  APPROVED("approved"),
-  
-  DELIVERED("delivered");
-
-  private String value;
-
-  OuterEnum(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnum fromValue(String value) {
-    for (OuterEnum b : OuterEnum.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
deleted file mode 100644
index 7f6c2c73aa2..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumDefaultValue.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnumDefaultValue
- */
-public enum OuterEnumDefaultValue {
-  
-  PLACED("placed"),
-  
-  APPROVED("approved"),
-  
-  DELIVERED("delivered");
-
-  private String value;
-
-  OuterEnumDefaultValue(String value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public String getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnumDefaultValue fromValue(String value) {
-    for (OuterEnumDefaultValue b : OuterEnumDefaultValue.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
deleted file mode 100644
index c747a2e6dae..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumInteger.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnumInteger
- */
-public enum OuterEnumInteger {
-  
-  NUMBER_0(0),
-  
-  NUMBER_1(1),
-  
-  NUMBER_2(2);
-
-  private Integer value;
-
-  OuterEnumInteger(Integer value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public Integer getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnumInteger fromValue(Integer value) {
-    for (OuterEnumInteger b : OuterEnumInteger.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
deleted file mode 100644
index 4f5fcd1cd95..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterEnumIntegerDefaultValue.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-
-/**
- * Gets or Sets OuterEnumIntegerDefaultValue
- */
-public enum OuterEnumIntegerDefaultValue {
-  
-  NUMBER_0(0),
-  
-  NUMBER_1(1),
-  
-  NUMBER_2(2);
-
-  private Integer value;
-
-  OuterEnumIntegerDefaultValue(Integer value) {
-    this.value = value;
-  }
-
-  @JsonValue
-  public Integer getValue() {
-    return value;
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  @JsonCreator
-  public static OuterEnumIntegerDefaultValue fromValue(Integer value) {
-    for (OuterEnumIntegerDefaultValue b : OuterEnumIntegerDefaultValue.values()) {
-      if (b.value.equals(value)) {
-        return b;
-      }
-    }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
deleted file mode 100644
index 5b3dc1ffcaa..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ParentPet.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ChildCat;
-import org.openapitools.client.model.GrandparentAnimal;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ParentPet
- */
-@JsonPropertyOrder({
-})
-
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "pet_type", visible = true)
-@JsonSubTypes({
-  @JsonSubTypes.Type(value = ChildCat.class, name = "ChildCat"),
-})
-
-public class ParentPet extends GrandparentAnimal {
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    return super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ParentPet {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
deleted file mode 100644
index 2df466732f7..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.ArrayList;
-import java.util.List;
-import org.openapitools.client.model.Category;
-import org.openapitools.client.model.Tag;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Pet
- */
-@JsonPropertyOrder({
-  Pet.JSON_PROPERTY_ID,
-  Pet.JSON_PROPERTY_CATEGORY,
-  Pet.JSON_PROPERTY_NAME,
-  Pet.JSON_PROPERTY_PHOTO_URLS,
-  Pet.JSON_PROPERTY_TAGS,
-  Pet.JSON_PROPERTY_STATUS
-})
-
-public class Pet {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_CATEGORY = "category";
-  private Category category;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-  public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  private List<String> photoUrls = new ArrayList<>();
-
-  public static final String JSON_PROPERTY_TAGS = "tags";
-  private List<Tag> tags = null;
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    
-    PENDING("pending"),
-    
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static StatusEnum fromValue(String value) {
-      for (StatusEnum b : StatusEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_STATUS = "status";
-  private StatusEnum status;
-
-
-  public Pet id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Pet category(Category category) {
-    
-    this.category = category;
-    return this;
-  }
-
-   /**
-   * Get category
-   * @return category
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_CATEGORY)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Category getCategory() {
-    return category;
-  }
-
-
-  public void setCategory(Category category) {
-    this.category = category;
-  }
-
-
-  public Pet name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @ApiModelProperty(example = "doggie", required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  public Pet photoUrls(List<String> photoUrls) {
-    
-    this.photoUrls = photoUrls;
-    return this;
-  }
-
-  public Pet addPhotoUrlsItem(String photoUrlsItem) {
-    this.photoUrls.add(photoUrlsItem);
-    return this;
-  }
-
-   /**
-   * Get photoUrls
-   * @return photoUrls
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-
-
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-
-  public Pet tags(List<Tag> tags) {
-    
-    this.tags = tags;
-    return this;
-  }
-
-  public Pet addTagsItem(Tag tagsItem) {
-    if (this.tags == null) {
-      this.tags = new ArrayList<>();
-    }
-    this.tags.add(tagsItem);
-    return this;
-  }
-
-   /**
-   * Get tags
-   * @return tags
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TAGS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public List<Tag> getTags() {
-    return tags;
-  }
-
-
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-
-  public Pet status(StatusEnum status) {
-    
-    this.status = status;
-    return this;
-  }
-
-   /**
-   * pet status in the store
-   * @return status
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "pet status in the store")
-  @JsonProperty(JSON_PROPERTY_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public StatusEnum getStatus() {
-    return status;
-  }
-
-
-  public void setStatus(StatusEnum status) {
-    this.status = status;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Pet pet = (Pet) o;
-    return Objects.equals(this.id, pet.id) &&
-        Objects.equals(this.category, pet.category) &&
-        Objects.equals(this.name, pet.name) &&
-        Objects.equals(this.photoUrls, pet.photoUrls) &&
-        Objects.equals(this.tags, pet.tags) &&
-        Objects.equals(this.status, pet.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, category, name, photoUrls, tags, status);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Pet {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
-    sb.append("    status: ").append(toIndentedString(status)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
deleted file mode 100644
index edf17c3ce78..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pig.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.BasquePig;
-import org.openapitools.client.model.DanishPig;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Pig.PigDeserializer.class)
-public class Pig extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Pig.class.getName());
-
-    public static class PigDeserializer extends StdDeserializer<Pig> {
-        public PigDeserializer() {
-            this(Pig.class);
-        }
-
-        public PigDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Pig deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize BasquePig
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(BasquePig.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'BasquePig'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'BasquePig'", e);
-            }
-
-            // deserialize DanishPig
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(DanishPig.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'DanishPig'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'DanishPig'", e);
-            }
-
-            if (match == 1) {
-                Pig ret = new Pig();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Pig: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Pig() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Pig(BasquePig o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Pig(DanishPig o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("BasquePig", new GenericType<BasquePig>() {
-        });
-        schemas.put("DanishPig", new GenericType<DanishPig>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Pig.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof BasquePig) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof DanishPig) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be BasquePig, DanishPig");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
deleted file mode 100644
index a943d3b0db3..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Quadrilateral.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ComplexQuadrilateral;
-import org.openapitools.client.model.SimpleQuadrilateral;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Quadrilateral.QuadrilateralDeserializer.class)
-public class Quadrilateral extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Quadrilateral.class.getName());
-
-    public static class QuadrilateralDeserializer extends StdDeserializer<Quadrilateral> {
-        public QuadrilateralDeserializer() {
-            this(Quadrilateral.class);
-        }
-
-        public QuadrilateralDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Quadrilateral deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize ComplexQuadrilateral
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(ComplexQuadrilateral.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'ComplexQuadrilateral'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'ComplexQuadrilateral'", e);
-            }
-
-            // deserialize SimpleQuadrilateral
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(SimpleQuadrilateral.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'SimpleQuadrilateral'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'SimpleQuadrilateral'", e);
-            }
-
-            if (match == 1) {
-                Quadrilateral ret = new Quadrilateral();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Quadrilateral: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Quadrilateral() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Quadrilateral(ComplexQuadrilateral o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Quadrilateral(SimpleQuadrilateral o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("ComplexQuadrilateral", new GenericType<ComplexQuadrilateral>() {
-        });
-        schemas.put("SimpleQuadrilateral", new GenericType<SimpleQuadrilateral>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Quadrilateral.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof ComplexQuadrilateral) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof SimpleQuadrilateral) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be ComplexQuadrilateral, SimpleQuadrilateral");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
deleted file mode 100644
index 7a586c4ca77..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * QuadrilateralInterface
- */
-@JsonPropertyOrder({
-  QuadrilateralInterface.JSON_PROPERTY_QUADRILATERAL_TYPE
-})
-
-public class QuadrilateralInterface {
-  public static final String JSON_PROPERTY_QUADRILATERAL_TYPE = "quadrilateralType";
-  private String quadrilateralType;
-
-
-  public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
-    
-    this.quadrilateralType = quadrilateralType;
-    return this;
-  }
-
-   /**
-   * Get quadrilateralType
-   * @return quadrilateralType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getQuadrilateralType() {
-    return quadrilateralType;
-  }
-
-
-  public void setQuadrilateralType(String quadrilateralType) {
-    this.quadrilateralType = quadrilateralType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    QuadrilateralInterface quadrilateralInterface = (QuadrilateralInterface) o;
-    return Objects.equals(this.quadrilateralType, quadrilateralInterface.quadrilateralType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(quadrilateralType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class QuadrilateralInterface {\n");
-    sb.append("    quadrilateralType: ").append(toIndentedString(quadrilateralType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
deleted file mode 100644
index b3e58ef3d2c..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ReadOnlyFirst
- */
-@JsonPropertyOrder({
-  ReadOnlyFirst.JSON_PROPERTY_BAR,
-  ReadOnlyFirst.JSON_PROPERTY_BAZ
-})
-
-public class ReadOnlyFirst {
-  public static final String JSON_PROPERTY_BAR = "bar";
-  private String bar;
-
-  public static final String JSON_PROPERTY_BAZ = "baz";
-  private String baz;
-
-
-   /**
-   * Get bar
-   * @return bar
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAR)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBar() {
-    return bar;
-  }
-
-
-
-
-  public ReadOnlyFirst baz(String baz) {
-    
-    this.baz = baz;
-    return this;
-  }
-
-   /**
-   * Get baz
-   * @return baz
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_BAZ)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getBaz() {
-    return baz;
-  }
-
-
-  public void setBaz(String baz) {
-    this.baz = baz;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
-    return Objects.equals(this.bar, readOnlyFirst.bar) &&
-        Objects.equals(this.baz, readOnlyFirst.baz);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(bar, baz);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ReadOnlyFirst {\n");
-    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
-    sb.append("    baz: ").append(toIndentedString(baz)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
deleted file mode 100644
index b8f6d9955d5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.ShapeInterface;
-import org.openapitools.client.model.TriangleInterface;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ScaleneTriangle
- */
-@JsonPropertyOrder({
-  ScaleneTriangle.JSON_PROPERTY_SHAPE_TYPE,
-  ScaleneTriangle.JSON_PROPERTY_TRIANGLE_TYPE
-})
-
-public class ScaleneTriangle {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-  public static final String JSON_PROPERTY_TRIANGLE_TYPE = "triangleType";
-  private String triangleType;
-
-
-  public ScaleneTriangle shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  public ScaleneTriangle triangleType(String triangleType) {
-    
-    this.triangleType = triangleType;
-    return this;
-  }
-
-   /**
-   * Get triangleType
-   * @return triangleType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getTriangleType() {
-    return triangleType;
-  }
-
-
-  public void setTriangleType(String triangleType) {
-    this.triangleType = triangleType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ScaleneTriangle scaleneTriangle = (ScaleneTriangle) o;
-    return Objects.equals(this.shapeType, scaleneTriangle.shapeType) &&
-        Objects.equals(this.triangleType, scaleneTriangle.triangleType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType, triangleType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ScaleneTriangle {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
-    sb.append("    triangleType: ").append(toIndentedString(triangleType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
deleted file mode 100644
index b97481242e5..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Shape.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Quadrilateral;
-import org.openapitools.client.model.Triangle;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Shape.ShapeDeserializer.class)
-public class Shape extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Shape.class.getName());
-
-    public static class ShapeDeserializer extends StdDeserializer<Shape> {
-        public ShapeDeserializer() {
-            this(Shape.class);
-        }
-
-        public ShapeDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Shape deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize Quadrilateral
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Quadrilateral'", e);
-            }
-
-            // deserialize Triangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Triangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Triangle'", e);
-            }
-
-            if (match == 1) {
-                Shape ret = new Shape();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Shape: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Shape() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Shape(Quadrilateral o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Shape(Triangle o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Quadrilateral", new GenericType<Quadrilateral>() {
-        });
-        schemas.put("Triangle", new GenericType<Triangle>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Shape.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Triangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Quadrilateral, Triangle");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
deleted file mode 100644
index 2b4cf219306..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * ShapeInterface
- */
-@JsonPropertyOrder({
-  ShapeInterface.JSON_PROPERTY_SHAPE_TYPE
-})
-
-public class ShapeInterface {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-
-  public ShapeInterface shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    ShapeInterface shapeInterface = (ShapeInterface) o;
-    return Objects.equals(this.shapeType, shapeInterface.shapeType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class ShapeInterface {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
deleted file mode 100644
index 6a47a10de5f..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeOrNull.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.Quadrilateral;
-import org.openapitools.client.model.Triangle;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=ShapeOrNull.ShapeOrNullDeserializer.class)
-public class ShapeOrNull extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(ShapeOrNull.class.getName());
-
-    public static class ShapeOrNullDeserializer extends StdDeserializer<ShapeOrNull> {
-        public ShapeOrNullDeserializer() {
-            this(ShapeOrNull.class);
-        }
-
-        public ShapeOrNullDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public ShapeOrNull deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize Quadrilateral
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Quadrilateral.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Quadrilateral'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Quadrilateral'", e);
-            }
-
-            // deserialize Triangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(Triangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'Triangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'Triangle'", e);
-            }
-
-            if (match == 1) {
-                ShapeOrNull ret = new ShapeOrNull();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for ShapeOrNull: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public ShapeOrNull() {
-        super("oneOf", Boolean.TRUE);
-    }
-
-    public ShapeOrNull(Quadrilateral o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    public ShapeOrNull(Triangle o) {
-        super("oneOf", Boolean.TRUE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("Quadrilateral", new GenericType<Quadrilateral>() {
-        });
-        schemas.put("Triangle", new GenericType<Triangle>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return ShapeOrNull.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof Quadrilateral) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof Triangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be Quadrilateral, Triangle");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
deleted file mode 100644
index 0ad65aa09dd..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.QuadrilateralInterface;
-import org.openapitools.client.model.ShapeInterface;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * SimpleQuadrilateral
- */
-@JsonPropertyOrder({
-  SimpleQuadrilateral.JSON_PROPERTY_SHAPE_TYPE,
-  SimpleQuadrilateral.JSON_PROPERTY_QUADRILATERAL_TYPE
-})
-
-public class SimpleQuadrilateral {
-  public static final String JSON_PROPERTY_SHAPE_TYPE = "shapeType";
-  private String shapeType;
-
-  public static final String JSON_PROPERTY_QUADRILATERAL_TYPE = "quadrilateralType";
-  private String quadrilateralType;
-
-
-  public SimpleQuadrilateral shapeType(String shapeType) {
-    
-    this.shapeType = shapeType;
-    return this;
-  }
-
-   /**
-   * Get shapeType
-   * @return shapeType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getShapeType() {
-    return shapeType;
-  }
-
-
-  public void setShapeType(String shapeType) {
-    this.shapeType = shapeType;
-  }
-
-
-  public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
-    
-    this.quadrilateralType = quadrilateralType;
-    return this;
-  }
-
-   /**
-   * Get quadrilateralType
-   * @return quadrilateralType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getQuadrilateralType() {
-    return quadrilateralType;
-  }
-
-
-  public void setQuadrilateralType(String quadrilateralType) {
-    this.quadrilateralType = quadrilateralType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SimpleQuadrilateral simpleQuadrilateral = (SimpleQuadrilateral) o;
-    return Objects.equals(this.shapeType, simpleQuadrilateral.shapeType) &&
-        Objects.equals(this.quadrilateralType, simpleQuadrilateral.quadrilateralType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(shapeType, quadrilateralType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SimpleQuadrilateral {\n");
-    sb.append("    shapeType: ").append(toIndentedString(shapeType)).append("\n");
-    sb.append("    quadrilateralType: ").append(toIndentedString(quadrilateralType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
deleted file mode 100644
index b588ef95226..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * SpecialModelName
- */
-@JsonPropertyOrder({
-  SpecialModelName.JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME
-})
-
-public class SpecialModelName {
-  public static final String JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME = "$special[property.name]";
-  private Long $specialPropertyName;
-
-
-  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
-    
-    this.$specialPropertyName = $specialPropertyName;
-    return this;
-  }
-
-   /**
-   * Get $specialPropertyName
-   * @return $specialPropertyName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long get$SpecialPropertyName() {
-    return $specialPropertyName;
-  }
-
-
-  public void set$SpecialPropertyName(Long $specialPropertyName) {
-    this.$specialPropertyName = $specialPropertyName;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    SpecialModelName specialModelName = (SpecialModelName) o;
-    return Objects.equals(this.$specialPropertyName, specialModelName.$specialPropertyName);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash($specialPropertyName);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class SpecialModelName {\n");
-    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
deleted file mode 100644
index a3ecb398faa..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Tag
- */
-@JsonPropertyOrder({
-  Tag.JSON_PROPERTY_ID,
-  Tag.JSON_PROPERTY_NAME
-})
-
-public class Tag {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_NAME = "name";
-  private String name;
-
-
-  public Tag id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public Tag name(String name) {
-    
-    this.name = name;
-    return this;
-  }
-
-   /**
-   * Get name
-   * @return name
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getName() {
-    return name;
-  }
-
-
-  public void setName(String name) {
-    this.name = name;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Tag tag = (Tag) o;
-    return Objects.equals(this.id, tag.id) &&
-        Objects.equals(this.name, tag.name);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, name);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Tag {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
deleted file mode 100644
index 0db61e7c160..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Triangle.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.openapitools.client.model.EquilateralTriangle;
-import org.openapitools.client.model.IsoscelesTriangle;
-import org.openapitools.client.model.ScaleneTriangle;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
-
-@JsonDeserialize(using=Triangle.TriangleDeserializer.class)
-public class Triangle extends AbstractOpenApiSchema {
-    private static final Logger log = Logger.getLogger(Triangle.class.getName());
-
-    public static class TriangleDeserializer extends StdDeserializer<Triangle> {
-        public TriangleDeserializer() {
-            this(Triangle.class);
-        }
-
-        public TriangleDeserializer(Class<?> vc) {
-            super(vc);
-        }
-
-        @Override
-        public Triangle deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
-            JsonNode tree = jp.readValueAsTree();
-
-            int match = 0;
-            Object deserialized = null;
-            // deserialize EquilateralTriangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(EquilateralTriangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'EquilateralTriangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'EquilateralTriangle'", e);
-            }
-
-            // deserialize IsoscelesTriangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(IsoscelesTriangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'IsoscelesTriangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'IsoscelesTriangle'", e);
-            }
-
-            // deserialize ScaleneTriangle
-            try {
-                deserialized = tree.traverse(jp.getCodec()).readValueAs(ScaleneTriangle.class);
-                match++;
-                log.log(Level.FINER, "Input data matches schema 'ScaleneTriangle'");
-            } catch (Exception e) {
-                // deserialization failed, continue
-                log.log(Level.FINER, "Input data does not match schema 'ScaleneTriangle'", e);
-            }
-
-            if (match == 1) {
-                Triangle ret = new Triangle();
-                ret.setActualInstance(deserialized);
-                return ret;
-            }
-            throw new IOException(String.format("Failed deserialization for Triangle: %d classes match result, expected 1", match));
-        }
-    }
-
-    // store a list of schema names defined in oneOf
-    public final static Map<String, GenericType> schemas = new HashMap<String, GenericType>();
-
-    public Triangle() {
-        super("oneOf", Boolean.FALSE);
-    }
-
-    public Triangle(EquilateralTriangle o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Triangle(IsoscelesTriangle o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    public Triangle(ScaleneTriangle o) {
-        super("oneOf", Boolean.FALSE);
-        setActualInstance(o);
-    }
-
-    static {
-        schemas.put("EquilateralTriangle", new GenericType<EquilateralTriangle>() {
-        });
-        schemas.put("IsoscelesTriangle", new GenericType<IsoscelesTriangle>() {
-        });
-        schemas.put("ScaleneTriangle", new GenericType<ScaleneTriangle>() {
-        });
-    }
-
-    @Override
-    public Map<String, GenericType> getSchemas() {
-        return Triangle.schemas;
-    }
-
-    @Override
-    public void setActualInstance(Object instance) {
-        if (instance instanceof EquilateralTriangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof IsoscelesTriangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        if (instance instanceof ScaleneTriangle) {
-            super.setActualInstance(instance);
-            return;
-        }
-
-        throw new RuntimeException("Invalid instance type. Must be EquilateralTriangle, IsoscelesTriangle, ScaleneTriangle");
-    }
-
-
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
deleted file mode 100644
index 5064ab5e3e6..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * TriangleInterface
- */
-@JsonPropertyOrder({
-  TriangleInterface.JSON_PROPERTY_TRIANGLE_TYPE
-})
-
-public class TriangleInterface {
-  public static final String JSON_PROPERTY_TRIANGLE_TYPE = "triangleType";
-  private String triangleType;
-
-
-  public TriangleInterface triangleType(String triangleType) {
-    
-    this.triangleType = triangleType;
-    return this;
-  }
-
-   /**
-   * Get triangleType
-   * @return triangleType
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getTriangleType() {
-    return triangleType;
-  }
-
-
-  public void setTriangleType(String triangleType) {
-    this.triangleType = triangleType;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    TriangleInterface triangleInterface = (TriangleInterface) o;
-    return Objects.equals(this.triangleType, triangleInterface.triangleType);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(triangleType);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class TriangleInterface {\n");
-    sb.append("    triangleType: ").append(toIndentedString(triangleType)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
deleted file mode 100644
index 570d1ace3ff..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.openapitools.jackson.nullable.JsonNullable;
-import java.util.NoSuchElementException;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * User
- */
-@JsonPropertyOrder({
-  User.JSON_PROPERTY_ID,
-  User.JSON_PROPERTY_USERNAME,
-  User.JSON_PROPERTY_FIRST_NAME,
-  User.JSON_PROPERTY_LAST_NAME,
-  User.JSON_PROPERTY_EMAIL,
-  User.JSON_PROPERTY_PASSWORD,
-  User.JSON_PROPERTY_PHONE,
-  User.JSON_PROPERTY_USER_STATUS,
-  User.JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS,
-  User.JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS_NULLABLE,
-  User.JSON_PROPERTY_ANY_TYPE_PROP,
-  User.JSON_PROPERTY_ANY_TYPE_PROP_NULLABLE
-})
-
-public class User {
-  public static final String JSON_PROPERTY_ID = "id";
-  private Long id;
-
-  public static final String JSON_PROPERTY_USERNAME = "username";
-  private String username;
-
-  public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  private String firstName;
-
-  public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  private String lastName;
-
-  public static final String JSON_PROPERTY_EMAIL = "email";
-  private String email;
-
-  public static final String JSON_PROPERTY_PASSWORD = "password";
-  private String password;
-
-  public static final String JSON_PROPERTY_PHONE = "phone";
-  private String phone;
-
-  public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  private Integer userStatus;
-
-  public static final String JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS = "objectWithNoDeclaredProps";
-  private Object objectWithNoDeclaredProps;
-
-  public static final String JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS_NULLABLE = "objectWithNoDeclaredPropsNullable";
-  private JsonNullable<Object> objectWithNoDeclaredPropsNullable = JsonNullable.<Object>undefined();
-
-  public static final String JSON_PROPERTY_ANY_TYPE_PROP = "anyTypeProp";
-  private JsonNullable<Object> anyTypeProp = JsonNullable.<Object>of(null);
-
-  public static final String JSON_PROPERTY_ANY_TYPE_PROP_NULLABLE = "anyTypePropNullable";
-  private JsonNullable<Object> anyTypePropNullable = JsonNullable.<Object>of(null);
-
-
-  public User id(Long id) {
-    
-    this.id = id;
-    return this;
-  }
-
-   /**
-   * Get id
-   * @return id
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_ID)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Long getId() {
-    return id;
-  }
-
-
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-
-  public User username(String username) {
-    
-    this.username = username;
-    return this;
-  }
-
-   /**
-   * Get username
-   * @return username
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_USERNAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getUsername() {
-    return username;
-  }
-
-
-  public void setUsername(String username) {
-    this.username = username;
-  }
-
-
-  public User firstName(String firstName) {
-    
-    this.firstName = firstName;
-    return this;
-  }
-
-   /**
-   * Get firstName
-   * @return firstName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_FIRST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getFirstName() {
-    return firstName;
-  }
-
-
-  public void setFirstName(String firstName) {
-    this.firstName = firstName;
-  }
-
-
-  public User lastName(String lastName) {
-    
-    this.lastName = lastName;
-    return this;
-  }
-
-   /**
-   * Get lastName
-   * @return lastName
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_LAST_NAME)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getLastName() {
-    return lastName;
-  }
-
-
-  public void setLastName(String lastName) {
-    this.lastName = lastName;
-  }
-
-
-  public User email(String email) {
-    
-    this.email = email;
-    return this;
-  }
-
-   /**
-   * Get email
-   * @return email
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_EMAIL)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getEmail() {
-    return email;
-  }
-
-
-  public void setEmail(String email) {
-    this.email = email;
-  }
-
-
-  public User password(String password) {
-    
-    this.password = password;
-    return this;
-  }
-
-   /**
-   * Get password
-   * @return password
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PASSWORD)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPassword() {
-    return password;
-  }
-
-
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-
-  public User phone(String phone) {
-    
-    this.phone = phone;
-    return this;
-  }
-
-   /**
-   * Get phone
-   * @return phone
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_PHONE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public String getPhone() {
-    return phone;
-  }
-
-
-  public void setPhone(String phone) {
-    this.phone = phone;
-  }
-
-
-  public User userStatus(Integer userStatus) {
-    
-    this.userStatus = userStatus;
-    return this;
-  }
-
-   /**
-   * User Status
-   * @return userStatus
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "User Status")
-  @JsonProperty(JSON_PROPERTY_USER_STATUS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Integer getUserStatus() {
-    return userStatus;
-  }
-
-
-  public void setUserStatus(Integer userStatus) {
-    this.userStatus = userStatus;
-  }
-
-
-  public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
-    
-    this.objectWithNoDeclaredProps = objectWithNoDeclaredProps;
-    return this;
-  }
-
-   /**
-   * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
-   * @return objectWithNoDeclaredProps
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "test code generation for objects Value must be a map of strings to values. It cannot be the 'null' value.")
-  @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Object getObjectWithNoDeclaredProps() {
-    return objectWithNoDeclaredProps;
-  }
-
-
-  public void setObjectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
-    this.objectWithNoDeclaredProps = objectWithNoDeclaredProps;
-  }
-
-
-  public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNullable) {
-    this.objectWithNoDeclaredPropsNullable = JsonNullable.<Object>of(objectWithNoDeclaredPropsNullable);
-    
-    return this;
-  }
-
-   /**
-   * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
-   * @return objectWithNoDeclaredPropsNullable
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "test code generation for nullable objects. Value must be a map of strings to values or the 'null' value.")
-  @JsonIgnore
-
-  public Object getObjectWithNoDeclaredPropsNullable() {
-        return objectWithNoDeclaredPropsNullable.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS_NULLABLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Object> getObjectWithNoDeclaredPropsNullable_JsonNullable() {
-    return objectWithNoDeclaredPropsNullable;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS_NULLABLE)
-  public void setObjectWithNoDeclaredPropsNullable_JsonNullable(JsonNullable<Object> objectWithNoDeclaredPropsNullable) {
-    this.objectWithNoDeclaredPropsNullable = objectWithNoDeclaredPropsNullable;
-  }
-
-  public void setObjectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNullable) {
-    this.objectWithNoDeclaredPropsNullable = JsonNullable.<Object>of(objectWithNoDeclaredPropsNullable);
-  }
-
-
-  public User anyTypeProp(Object anyTypeProp) {
-    this.anyTypeProp = JsonNullable.<Object>of(anyTypeProp);
-    
-    return this;
-  }
-
-   /**
-   * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
-   * @return anyTypeProp
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389")
-  @JsonIgnore
-
-  public Object getAnyTypeProp() {
-        return anyTypeProp.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_ANY_TYPE_PROP)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Object> getAnyTypeProp_JsonNullable() {
-    return anyTypeProp;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_ANY_TYPE_PROP)
-  public void setAnyTypeProp_JsonNullable(JsonNullable<Object> anyTypeProp) {
-    this.anyTypeProp = anyTypeProp;
-  }
-
-  public void setAnyTypeProp(Object anyTypeProp) {
-    this.anyTypeProp = JsonNullable.<Object>of(anyTypeProp);
-  }
-
-
-  public User anyTypePropNullable(Object anyTypePropNullable) {
-    this.anyTypePropNullable = JsonNullable.<Object>of(anyTypePropNullable);
-    
-    return this;
-  }
-
-   /**
-   * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
-   * @return anyTypePropNullable
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "test code generation for any type Here the 'type' attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The 'nullable' attribute does not change the allowed values.")
-  @JsonIgnore
-
-  public Object getAnyTypePropNullable() {
-        return anyTypePropNullable.orElse(null);
-  }
-
-  @JsonProperty(JSON_PROPERTY_ANY_TYPE_PROP_NULLABLE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public JsonNullable<Object> getAnyTypePropNullable_JsonNullable() {
-    return anyTypePropNullable;
-  }
-  
-  @JsonProperty(JSON_PROPERTY_ANY_TYPE_PROP_NULLABLE)
-  public void setAnyTypePropNullable_JsonNullable(JsonNullable<Object> anyTypePropNullable) {
-    this.anyTypePropNullable = anyTypePropNullable;
-  }
-
-  public void setAnyTypePropNullable(Object anyTypePropNullable) {
-    this.anyTypePropNullable = JsonNullable.<Object>of(anyTypePropNullable);
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    User user = (User) o;
-    return Objects.equals(this.id, user.id) &&
-        Objects.equals(this.username, user.username) &&
-        Objects.equals(this.firstName, user.firstName) &&
-        Objects.equals(this.lastName, user.lastName) &&
-        Objects.equals(this.email, user.email) &&
-        Objects.equals(this.password, user.password) &&
-        Objects.equals(this.phone, user.phone) &&
-        Objects.equals(this.userStatus, user.userStatus) &&
-        Objects.equals(this.objectWithNoDeclaredProps, user.objectWithNoDeclaredProps) &&
-        Objects.equals(this.objectWithNoDeclaredPropsNullable, user.objectWithNoDeclaredPropsNullable) &&
-        Objects.equals(this.anyTypeProp, user.anyTypeProp) &&
-        Objects.equals(this.anyTypePropNullable, user.anyTypePropNullable);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus, objectWithNoDeclaredProps, objectWithNoDeclaredPropsNullable, anyTypeProp, anyTypePropNullable);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class User {\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    username: ").append(toIndentedString(username)).append("\n");
-    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
-    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
-    sb.append("    email: ").append(toIndentedString(email)).append("\n");
-    sb.append("    password: ").append(toIndentedString(password)).append("\n");
-    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
-    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
-    sb.append("    objectWithNoDeclaredProps: ").append(toIndentedString(objectWithNoDeclaredProps)).append("\n");
-    sb.append("    objectWithNoDeclaredPropsNullable: ").append(toIndentedString(objectWithNoDeclaredPropsNullable)).append("\n");
-    sb.append("    anyTypeProp: ").append(toIndentedString(anyTypeProp)).append("\n");
-    sb.append("    anyTypePropNullable: ").append(toIndentedString(anyTypePropNullable)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
deleted file mode 100644
index 64c82e711ac..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Whale
- */
-@JsonPropertyOrder({
-  Whale.JSON_PROPERTY_HAS_BALEEN,
-  Whale.JSON_PROPERTY_HAS_TEETH,
-  Whale.JSON_PROPERTY_CLASS_NAME
-})
-
-public class Whale {
-  public static final String JSON_PROPERTY_HAS_BALEEN = "hasBaleen";
-  private Boolean hasBaleen;
-
-  public static final String JSON_PROPERTY_HAS_TEETH = "hasTeeth";
-  private Boolean hasTeeth;
-
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  private String className;
-
-
-  public Whale hasBaleen(Boolean hasBaleen) {
-    
-    this.hasBaleen = hasBaleen;
-    return this;
-  }
-
-   /**
-   * Get hasBaleen
-   * @return hasBaleen
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_HAS_BALEEN)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getHasBaleen() {
-    return hasBaleen;
-  }
-
-
-  public void setHasBaleen(Boolean hasBaleen) {
-    this.hasBaleen = hasBaleen;
-  }
-
-
-  public Whale hasTeeth(Boolean hasTeeth) {
-    
-    this.hasTeeth = hasTeeth;
-    return this;
-  }
-
-   /**
-   * Get hasTeeth
-   * @return hasTeeth
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_HAS_TEETH)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public Boolean getHasTeeth() {
-    return hasTeeth;
-  }
-
-
-  public void setHasTeeth(Boolean hasTeeth) {
-    this.hasTeeth = hasTeeth;
-  }
-
-
-  public Whale className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Whale whale = (Whale) o;
-    return Objects.equals(this.hasBaleen, whale.hasBaleen) &&
-        Objects.equals(this.hasTeeth, whale.hasTeeth) &&
-        Objects.equals(this.className, whale.className);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(hasBaleen, hasTeeth, className);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Whale {\n");
-    sb.append("    hasBaleen: ").append(toIndentedString(hasBaleen)).append("\n");
-    sb.append("    hasTeeth: ").append(toIndentedString(hasTeeth)).append("\n");
-    sb.append("    className: ").append(toIndentedString(className)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
deleted file mode 100644
index 84436cf0de9..00000000000
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * 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.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.HashMap;
-import java.util.Map;
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
-/**
- * Zebra
- */
-@JsonPropertyOrder({
-  Zebra.JSON_PROPERTY_TYPE,
-  Zebra.JSON_PROPERTY_CLASS_NAME
-})
-
-public class Zebra extends HashMap<String, Object> {
-  /**
-   * Gets or Sets type
-   */
-  public enum TypeEnum {
-    PLAINS("plains"),
-    
-    MOUNTAIN("mountain"),
-    
-    GREVYS("grevys");
-
-    private String value;
-
-    TypeEnum(String value) {
-      this.value = value;
-    }
-
-    @JsonValue
-    public String getValue() {
-      return value;
-    }
-
-    @Override
-    public String toString() {
-      return String.valueOf(value);
-    }
-
-    @JsonCreator
-    public static TypeEnum fromValue(String value) {
-      for (TypeEnum b : TypeEnum.values()) {
-        if (b.value.equals(value)) {
-          return b;
-        }
-      }
-      throw new IllegalArgumentException("Unexpected value '" + value + "'");
-    }
-  }
-
-  public static final String JSON_PROPERTY_TYPE = "type";
-  private TypeEnum type;
-
-  public static final String JSON_PROPERTY_CLASS_NAME = "className";
-  private String className;
-
-
-  public Zebra type(TypeEnum type) {
-    
-    this.type = type;
-    return this;
-  }
-
-   /**
-   * Get type
-   * @return type
-  **/
-  @javax.annotation.Nullable
-  @ApiModelProperty(value = "")
-  @JsonProperty(JSON_PROPERTY_TYPE)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
-  public TypeEnum getType() {
-    return type;
-  }
-
-
-  public void setType(TypeEnum type) {
-    this.type = type;
-  }
-
-
-  public Zebra className(String className) {
-    
-    this.className = className;
-    return this;
-  }
-
-   /**
-   * Get className
-   * @return className
-  **/
-  @ApiModelProperty(required = true, value = "")
-  @JsonProperty(JSON_PROPERTY_CLASS_NAME)
-  @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
-  public String getClassName() {
-    return className;
-  }
-
-
-  public void setClassName(String className) {
-    this.className = className;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    Zebra zebra = (Zebra) o;
-    return Objects.equals(this.type, zebra.type) &&
-        Objects.equals(this.className, zebra.className) &&
-        super.equals(o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(type, className, super.hashCode());
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class Zebra {\n");
-    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
-    sb.append("    type: ").append(toIndentedString(type)).append("\n");
-    sb.append("    className: ").append(toIndentedString(className)).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(java.lang.Object o) {
-    if (o == null) {
-      return "null";
-    }
-    return o.toString().replace("\n", "\n    ");
-  }
-
-}
-

From b2305d731c41fcf216579b5216bba18566610625 Mon Sep 17 00:00:00 2001
From: sylvainmoindron <43030050+sylvainmoindron@users.noreply.github.com>
Date: Thu, 4 Jun 2020 04:36:21 +0200
Subject: [PATCH 11/22] #5476 [kotlin] [spring] fix swagger and spring
 annotation for defaultValue (#6101)

---
 .../src/main/resources/kotlin-spring/queryParams.mustache       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache
index ecceefb0856..e769fa0ce08 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/queryParams.mustache
@@ -1 +1 @@
-{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = "{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{/swaggerAnnotations}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{paramName}}: {{>optionalDataType}}{{/isQueryParam}}
\ No newline at end of file
+{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}{{#swaggerAnnotations}}@ApiParam(value = "{{{description}}}"{{#required}}, required = true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue = {{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}}{{/swaggerAnnotations}} @RequestParam(value = "{{baseName}}"{{#required}}, required = true{{/required}}{{^required}}, required = false{{/required}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}) {{paramName}}: {{>optionalDataType}}{{/isQueryParam}}
\ No newline at end of file

From a6bf956df5bd0b5eae0b7f70c1e6c044845eb798 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 11:33:21 +0800
Subject: [PATCH 12/22] [Go][Experimental] Support additionalProperties (#6525)

* support additonal properties in go

* support additonal properties marshal in go exp

* update go samples
---
 .../GoClientExperimentalCodegen.java          |  7 +++-
 .../go-experimental/model_simple.mustache     | 37 ++++++++++++++++++-
 ...odels-for-testing-with-http-signature.yaml |  1 +
 .../go-petstore/model_200_response.go         |  1 +
 .../model_additional_properties_any_type.go   | 26 +++++++++++++
 .../model_additional_properties_array.go      |  1 +
 .../model_additional_properties_boolean.go    |  1 +
 .../model_additional_properties_class.go      |  1 +
 .../model_additional_properties_integer.go    |  1 +
 .../model_additional_properties_number.go     |  1 +
 .../model_additional_properties_object.go     |  1 +
 .../model_additional_properties_string.go     |  1 +
 .../go-petstore/model_animal.go               |  1 +
 .../go-petstore/model_api_response.go         |  1 +
 .../model_array_of_array_of_number_only.go    |  1 +
 .../go-petstore/model_array_of_number_only.go |  1 +
 .../go-petstore/model_array_test_.go          |  1 +
 .../go-petstore/model_big_cat.go              |  1 +
 .../go-petstore/model_big_cat_all_of.go       |  1 +
 .../go-petstore/model_capitalization.go       |  1 +
 .../go-experimental/go-petstore/model_cat.go  |  1 +
 .../go-petstore/model_cat_all_of.go           |  1 +
 .../go-petstore/model_category.go             |  1 +
 .../go-petstore/model_class_model.go          |  1 +
 .../go-petstore/model_client.go               |  1 +
 .../go-experimental/go-petstore/model_dog.go  |  1 +
 .../go-petstore/model_dog_all_of.go           |  1 +
 .../go-petstore/model_enum_arrays.go          |  1 +
 .../go-petstore/model_enum_test_.go           |  1 +
 .../go-experimental/go-petstore/model_file.go |  1 +
 .../model_file_schema_test_class.go           |  1 +
 .../go-petstore/model_format_test_.go         |  1 +
 .../go-petstore/model_has_only_read_only.go   |  1 +
 .../go-experimental/go-petstore/model_list.go |  1 +
 .../go-petstore/model_map_test_.go            |  1 +
 ...perties_and_additional_properties_class.go |  1 +
 .../go-experimental/go-petstore/model_name.go |  1 +
 .../go-petstore/model_number_only.go          |  1 +
 .../go-petstore/model_order.go                |  1 +
 .../go-petstore/model_outer_composite.go      |  1 +
 .../go-experimental/go-petstore/model_pet.go  |  1 +
 .../go-petstore/model_read_only_first.go      |  1 +
 .../go-petstore/model_return.go               |  1 +
 .../go-petstore/model_special_model_name.go   |  1 +
 .../go-experimental/go-petstore/model_tag.go  |  1 +
 .../go-petstore/model_type_holder_default.go  |  1 +
 .../go-petstore/model_type_holder_example.go  |  1 +
 .../go-experimental/go-petstore/model_user.go |  1 +
 .../go-petstore/model_xml_item.go             |  1 +
 .../go-petstore/api/openapi.yaml              |  1 +
 .../go-petstore/model_200_response.go         |  1 +
 .../go-petstore/model__special_model_name_.go |  1 +
 .../model_additional_properties_class.go      |  1 +
 .../go-petstore/model_animal.go               |  1 +
 .../go-petstore/model_api_response.go         |  1 +
 .../go-petstore/model_apple.go                |  1 +
 .../go-petstore/model_apple_req.go            |  1 +
 .../model_array_of_array_of_number_only.go    |  1 +
 .../go-petstore/model_array_of_number_only.go |  1 +
 .../go-petstore/model_array_test_.go          |  1 +
 .../go-petstore/model_banana.go               | 26 +++++++++++++
 .../go-petstore/model_banana_req.go           |  1 +
 .../go-petstore/model_capitalization.go       |  1 +
 .../go-experimental/go-petstore/model_cat.go  |  1 +
 .../go-petstore/model_cat_all_of.go           |  1 +
 .../go-petstore/model_category.go             |  1 +
 .../go-petstore/model_class_model.go          |  1 +
 .../go-petstore/model_client.go               |  1 +
 .../go-experimental/go-petstore/model_dog.go  |  1 +
 .../go-petstore/model_dog_all_of.go           |  1 +
 .../go-petstore/model_enum_arrays.go          |  1 +
 .../go-petstore/model_enum_test_.go           |  1 +
 .../go-experimental/go-petstore/model_file.go |  1 +
 .../model_file_schema_test_class.go           |  1 +
 .../go-experimental/go-petstore/model_foo.go  |  1 +
 .../go-petstore/model_format_test_.go         |  1 +
 .../go-petstore/model_has_only_read_only.go   |  1 +
 .../go-petstore/model_health_check_result.go  |  1 +
 .../go-petstore/model_inline_object.go        |  1 +
 .../go-petstore/model_inline_object_1.go      |  1 +
 .../go-petstore/model_inline_object_2.go      |  1 +
 .../go-petstore/model_inline_object_3.go      |  1 +
 .../go-petstore/model_inline_object_4.go      |  1 +
 .../go-petstore/model_inline_object_5.go      |  1 +
 .../model_inline_response_default.go          |  1 +
 .../go-experimental/go-petstore/model_list.go |  1 +
 .../go-petstore/model_map_test_.go            |  1 +
 ...perties_and_additional_properties_class.go |  1 +
 .../go-experimental/go-petstore/model_name.go |  1 +
 .../go-petstore/model_nullable_class.go       | 37 +++++++++++++++++++
 .../go-petstore/model_number_only.go          |  1 +
 .../go-petstore/model_order.go                |  1 +
 .../go-petstore/model_outer_composite.go      |  1 +
 .../go-experimental/go-petstore/model_pet.go  |  1 +
 .../go-petstore/model_read_only_first.go      |  1 +
 .../go-petstore/model_return.go               |  1 +
 .../go-experimental/go-petstore/model_tag.go  |  1 +
 .../go-experimental/go-petstore/model_user.go |  1 +
 .../go-petstore/model_whale.go                |  1 +
 .../go-petstore/model_zebra.go                |  1 +
 .../petstore/go-experimental/model_test.go    | 34 +++++++++++++++++
 101 files changed, 259 insertions(+), 3 deletions(-)
 create mode 100644 samples/openapi3/client/petstore/go-experimental/model_test.go

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
index ddb10684f2a..b9e9fbedbec 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
@@ -222,9 +222,12 @@ public class GoClientExperimentalCodegen extends GoClientCodegen {
                 if (model.anyOf != null && !model.anyOf.isEmpty()) {
                     imports.add(createMapping("import", "fmt"));
                 }
+
+                // add x-additional-properties
+                if ("map[string]map[string]interface{}".equals(model.parent)) {
+                    model.vendorExtensions.put("x-additional-properties", true);
+                }
             }
-
-
         }
         return objs;
     }
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_simple.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_simple.mustache
index 1078787c86d..c4d8d5f684f 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_simple.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_simple.mustache
@@ -13,8 +13,15 @@ type {{classname}} struct {
 {{/description}}
 	{{name}} {{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
 {{/vars}}
+{{#vendorExtensions.x-additional-properties}}
+	AdditionalProperties map[string]interface{}
+{{/vendorExtensions.x-additional-properties}}
 }
 
+{{#vendorExtensions.x-additional-properties}}
+type _{{{classname}}} {{{classname}}}
+
+{{/vendorExtensions.x-additional-properties}}
 // New{{classname}} instantiates a new {{classname}} 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
@@ -246,7 +253,35 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) {
 	}
 	{{/isNullable}}
 	{{/vars}}
+	{{#vendorExtensions.x-additional-properties}}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
+	{{/vendorExtensions.x-additional-properties}}
 	return json.Marshal(toSerialize)
 }
 
-{{>nullable_model}}
\ No newline at end of file
+{{#vendorExtensions.x-additional-properties}}
+func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
+	var{{{classname}}} := _{{{classname}}}{}
+
+	if err = json.Unmarshal(bytes, &var{{{classname}}}); err == nil {
+		*o = {{{classname}}}(var{{{classname}}})
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		{{#vars}}
+		delete(additionalProperties, "{{{baseName}}}")
+		{{/vars}}
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
+{{/vendorExtensions.x-additional-properties}}
+{{>nullable_model}}
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index 74598c6ce70..81c4cf697c0 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1810,6 +1810,7 @@ components:
           type: string
     banana:
       type: object
+      additionalProperties: true
       properties:
         lengthCm:
           type: number
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_200_response.go b/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
index 0eea6ec0447..c23c13c54c2 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
@@ -147,3 +147,4 @@ func (v *NullableModel200Response) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
index 9618b3d2a26..59e7a4dec0a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
@@ -16,8 +16,11 @@ import (
 // AdditionalPropertiesAnyType struct for AdditionalPropertiesAnyType
 type AdditionalPropertiesAnyType struct {
 	Name *string `json:"name,omitempty"`
+	AdditionalProperties map[string]interface{}
 }
 
+type _AdditionalPropertiesAnyType AdditionalPropertiesAnyType
+
 // NewAdditionalPropertiesAnyType instantiates a new AdditionalPropertiesAnyType 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
@@ -72,9 +75,31 @@ func (o AdditionalPropertiesAnyType) MarshalJSON() ([]byte, error) {
 	if o.Name != nil {
 		toSerialize["name"] = o.Name
 	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
 	return json.Marshal(toSerialize)
 }
 
+func (o *AdditionalPropertiesAnyType) UnmarshalJSON(bytes []byte) (err error) {
+	varAdditionalPropertiesAnyType := _AdditionalPropertiesAnyType{}
+
+	if err = json.Unmarshal(bytes, &varAdditionalPropertiesAnyType); err == nil {
+		*o = AdditionalPropertiesAnyType(varAdditionalPropertiesAnyType)
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		delete(additionalProperties, "name")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
 type NullableAdditionalPropertiesAnyType struct {
 	value *AdditionalPropertiesAnyType
 	isSet bool
@@ -111,3 +136,4 @@ func (v *NullableAdditionalPropertiesAnyType) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
index 32b38620ad4..7952e9cd56a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesArray) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
index 098e83c9c42..f64d9633a47 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesBoolean) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
index 046e91b9075..d60a6889b74 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
@@ -471,3 +471,4 @@ func (v *NullableAdditionalPropertiesClass) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
index dfedb1bc545..eeb60fc08db 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesInteger) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
index 10428e020c0..bd385cbe088 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesNumber) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
index 6f16a067a4a..69fb5e31044 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesObject) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
index b3f971dd13a..54928c3a1c9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
@@ -111,3 +111,4 @@ func (v *NullableAdditionalPropertiesString) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_animal.go b/samples/client/petstore/go-experimental/go-petstore/model_animal.go
index a1a7f99db9d..5aa1f60f02f 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_animal.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_animal.go
@@ -144,3 +144,4 @@ func (v *NullableAnimal) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_api_response.go b/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
index f66dd2b120d..17bf558d1c9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
@@ -183,3 +183,4 @@ func (v *NullableApiResponse) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
index 27cc790083d..6b81323ac4d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableArrayOfArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
index ba3cdec1dde..f43bffc1c87 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
index bcb08067162..42e2be66d62 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
@@ -183,3 +183,4 @@ func (v *NullableArrayTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_big_cat.go b/samples/client/petstore/go-experimental/go-petstore/model_big_cat.go
index f4457f7a83c..27b8085b241 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_big_cat.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_big_cat.go
@@ -120,3 +120,4 @@ func (v *NullableBigCat) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_big_cat_all_of.go b/samples/client/petstore/go-experimental/go-petstore/model_big_cat_all_of.go
index f5594871944..6434cd11d7c 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_big_cat_all_of.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_big_cat_all_of.go
@@ -111,3 +111,4 @@ func (v *NullableBigCatAllOf) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go b/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
index 782bbab9b1f..7f2c90863e0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
@@ -292,3 +292,4 @@ func (v *NullableCapitalization) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_cat.go b/samples/client/petstore/go-experimental/go-petstore/model_cat.go
index 6f7425873cd..d6573c99bac 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_cat.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_cat.go
@@ -120,3 +120,4 @@ func (v *NullableCat) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go b/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
index 2efc62d2022..643ba03973f 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
@@ -111,3 +111,4 @@ func (v *NullableCatAllOf) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_category.go b/samples/client/petstore/go-experimental/go-petstore/model_category.go
index e00cc7ba84b..0c462889533 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_category.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_category.go
@@ -142,3 +142,4 @@ func (v *NullableCategory) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_class_model.go b/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
index 5213ad9d879..7236de0ee07 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
@@ -111,3 +111,4 @@ func (v *NullableClassModel) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_client.go b/samples/client/petstore/go-experimental/go-petstore/model_client.go
index d1b9ffcc287..edfdde067ef 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_client.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_client.go
@@ -111,3 +111,4 @@ func (v *NullableClient) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_dog.go b/samples/client/petstore/go-experimental/go-petstore/model_dog.go
index 12a5bee4876..ebbedeec53e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_dog.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_dog.go
@@ -120,3 +120,4 @@ func (v *NullableDog) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go b/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
index a5a791e50f0..c13aa2b2cd5 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
@@ -111,3 +111,4 @@ func (v *NullableDogAllOf) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
index 1fbadb34e71..b18984ce730 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
@@ -147,3 +147,4 @@ func (v *NullableEnumArrays) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
index 852dd860739..c39d045e5a6 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
@@ -248,3 +248,4 @@ func (v *NullableEnumTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_file.go b/samples/client/petstore/go-experimental/go-petstore/model_file.go
index d7a50dc683a..43ec19f8638 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_file.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_file.go
@@ -112,3 +112,4 @@ func (v *NullableFile) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go b/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
index 887cd35c752..626a3765173 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
@@ -147,3 +147,4 @@ func (v *NullableFileSchemaTestClass) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
index dbccde98dc4..aa1889aedda 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
@@ -553,3 +553,4 @@ func (v *NullableFormatTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go b/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
index 0aa39e6de8c..3400c73dca6 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
@@ -147,3 +147,4 @@ func (v *NullableHasOnlyReadOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_list.go b/samples/client/petstore/go-experimental/go-petstore/model_list.go
index 7966d7b337c..f49afaa71f3 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_list.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_list.go
@@ -111,3 +111,4 @@ func (v *NullableList) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
index 42724f8d875..4fc2c0b4799 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
@@ -219,3 +219,4 @@ func (v *NullableMapTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
index 21b7cb60ab4..69cc134169e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
@@ -184,3 +184,4 @@ func (v *NullableMixedPropertiesAndAdditionalPropertiesClass) UnmarshalJSON(src
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_name.go b/samples/client/petstore/go-experimental/go-petstore/model_name.go
index f910dc37c0c..82e49591874 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_name.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_name.go
@@ -212,3 +212,4 @@ func (v *NullableName) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
index 6307b2871e9..efa8b66a5bc 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_order.go b/samples/client/petstore/go-experimental/go-petstore/model_order.go
index 797c8e9236f..b20a1429848 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_order.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_order.go
@@ -297,3 +297,4 @@ func (v *NullableOrder) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go b/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
index 88049de0dac..9a76c753b64 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
@@ -183,3 +183,4 @@ func (v *NullableOuterComposite) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_pet.go b/samples/client/petstore/go-experimental/go-petstore/model_pet.go
index 876af8724d7..8bc4457fc37 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_pet.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_pet.go
@@ -278,3 +278,4 @@ func (v *NullablePet) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go b/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
index af6291b4c82..dd00212c1d0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
@@ -147,3 +147,4 @@ func (v *NullableReadOnlyFirst) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_return.go b/samples/client/petstore/go-experimental/go-petstore/model_return.go
index e6350da030c..2ed729e12ec 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_return.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_return.go
@@ -111,3 +111,4 @@ func (v *NullableReturn) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go b/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
index e50eb5d32d1..bbef383b796 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
@@ -111,3 +111,4 @@ func (v *NullableSpecialModelName) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_tag.go b/samples/client/petstore/go-experimental/go-petstore/model_tag.go
index 0f8157a6b7a..99135ba946b 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_tag.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_tag.go
@@ -147,3 +147,4 @@ func (v *NullableTag) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
index 3ff4e709be1..d45748bf769 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
@@ -224,3 +224,4 @@ func (v *NullableTypeHolderDefault) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
index 4996f734edc..3f74c433f71 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
@@ -249,3 +249,4 @@ func (v *NullableTypeHolderExample) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_user.go b/samples/client/petstore/go-experimental/go-petstore/model_user.go
index 29f2e3f2652..7dff4e8b36b 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_user.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_user.go
@@ -364,3 +364,4 @@ func (v *NullableUser) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go b/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
index 1d78601f060..8bf7f3ef707 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
@@ -1119,3 +1119,4 @@ func (v *NullableXmlItem) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go-experimental/go-petstore/api/openapi.yaml
index f7bec563071..7e77947b7a7 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/api/openapi.yaml
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/api/openapi.yaml
@@ -1925,6 +1925,7 @@ components:
           type: string
       type: object
     banana:
+      additionalProperties: true
       properties:
         lengthCm:
           type: number
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_200_response.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_200_response.go
index 0eea6ec0447..c23c13c54c2 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_200_response.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_200_response.go
@@ -147,3 +147,4 @@ func (v *NullableModel200Response) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model__special_model_name_.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model__special_model_name_.go
index e50eb5d32d1..bbef383b796 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model__special_model_name_.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model__special_model_name_.go
@@ -111,3 +111,4 @@ func (v *NullableSpecialModelName) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
index 941f00027db..2ac0b72cfa2 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
@@ -147,3 +147,4 @@ func (v *NullableAdditionalPropertiesClass) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_animal.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_animal.go
index a1a7f99db9d..5aa1f60f02f 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_animal.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_animal.go
@@ -144,3 +144,4 @@ func (v *NullableAnimal) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_api_response.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_api_response.go
index f66dd2b120d..17bf558d1c9 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_api_response.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_api_response.go
@@ -183,3 +183,4 @@ func (v *NullableApiResponse) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple.go
index d6800b1ad0a..97b0b94f3e9 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple.go
@@ -111,3 +111,4 @@ func (v *NullableApple) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple_req.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple_req.go
index f5f4cbad71e..3879864cf14 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple_req.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_apple_req.go
@@ -140,3 +140,4 @@ func (v *NullableAppleReq) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
index 27cc790083d..6b81323ac4d 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableArrayOfArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
index ba3cdec1dde..f43bffc1c87 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_test_.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_test_.go
index bcb08067162..42e2be66d62 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_test_.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_array_test_.go
@@ -183,3 +183,4 @@ func (v *NullableArrayTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana.go
index a4fb1e38640..f375a8b8f9c 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana.go
@@ -16,8 +16,11 @@ import (
 // Banana struct for Banana
 type Banana struct {
 	LengthCm *float32 `json:"lengthCm,omitempty"`
+	AdditionalProperties map[string]interface{}
 }
 
+type _Banana Banana
+
 // NewBanana instantiates a new Banana 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
@@ -72,9 +75,31 @@ func (o Banana) MarshalJSON() ([]byte, error) {
 	if o.LengthCm != nil {
 		toSerialize["lengthCm"] = o.LengthCm
 	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
 	return json.Marshal(toSerialize)
 }
 
+func (o *Banana) UnmarshalJSON(bytes []byte) (err error) {
+	varBanana := _Banana{}
+
+	if err = json.Unmarshal(bytes, &varBanana); err == nil {
+		*o = Banana(varBanana)
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		delete(additionalProperties, "lengthCm")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
 type NullableBanana struct {
 	value *Banana
 	isSet bool
@@ -111,3 +136,4 @@ func (v *NullableBanana) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana_req.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana_req.go
index eb0d40c61d9..ed874ef2e6f 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana_req.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana_req.go
@@ -140,3 +140,4 @@ func (v *NullableBananaReq) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_capitalization.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_capitalization.go
index 782bbab9b1f..7f2c90863e0 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_capitalization.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_capitalization.go
@@ -292,3 +292,4 @@ func (v *NullableCapitalization) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat.go
index 6f7425873cd..d6573c99bac 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat.go
@@ -120,3 +120,4 @@ func (v *NullableCat) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat_all_of.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
index 2efc62d2022..643ba03973f 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
@@ -111,3 +111,4 @@ func (v *NullableCatAllOf) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_category.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_category.go
index e00cc7ba84b..0c462889533 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_category.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_category.go
@@ -142,3 +142,4 @@ func (v *NullableCategory) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_class_model.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_class_model.go
index 5213ad9d879..7236de0ee07 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_class_model.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_class_model.go
@@ -111,3 +111,4 @@ func (v *NullableClassModel) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_client.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_client.go
index d1b9ffcc287..edfdde067ef 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_client.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_client.go
@@ -111,3 +111,4 @@ func (v *NullableClient) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog.go
index 12a5bee4876..ebbedeec53e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog.go
@@ -120,3 +120,4 @@ func (v *NullableDog) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog_all_of.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
index a5a791e50f0..c13aa2b2cd5 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
@@ -111,3 +111,4 @@ func (v *NullableDogAllOf) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_arrays.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
index 1fbadb34e71..b18984ce730 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
@@ -147,3 +147,4 @@ func (v *NullableEnumArrays) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_test_.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_test_.go
index f9c20efe677..d6da2e58bf9 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_test_.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_enum_test_.go
@@ -374,3 +374,4 @@ func (v *NullableEnumTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file.go
index d7a50dc683a..43ec19f8638 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file.go
@@ -112,3 +112,4 @@ func (v *NullableFile) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
index 887cd35c752..626a3765173 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
@@ -147,3 +147,4 @@ func (v *NullableFileSchemaTestClass) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_foo.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_foo.go
index 825b2761c1c..723deec46aa 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_foo.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_foo.go
@@ -115,3 +115,4 @@ func (v *NullableFoo) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_format_test_.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_format_test_.go
index bcc0289a091..67f0c80c72e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_format_test_.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_format_test_.go
@@ -591,3 +591,4 @@ func (v *NullableFormatTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
index 0aa39e6de8c..3400c73dca6 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
@@ -147,3 +147,4 @@ func (v *NullableHasOnlyReadOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_health_check_result.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_health_check_result.go
index af5a5b94a1e..70874db5605 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_health_check_result.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_health_check_result.go
@@ -121,3 +121,4 @@ func (v *NullableHealthCheckResult) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object.go
index ec6a571e8eb..35df941a0d6 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object.go
@@ -149,3 +149,4 @@ func (v *NullableInlineObject) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_1.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_1.go
index d95ad59790a..a400eda20e3 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_1.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_1.go
@@ -150,3 +150,4 @@ func (v *NullableInlineObject1) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_2.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_2.go
index d3029a8e77b..a80ba9b9e5c 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_2.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_2.go
@@ -153,3 +153,4 @@ func (v *NullableInlineObject2) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_3.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_3.go
index c51c19956f5..9dcc233d034 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_3.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_3.go
@@ -567,3 +567,4 @@ func (v *NullableInlineObject3) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_4.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_4.go
index b4fcf5fa1f0..783556ef23c 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_4.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_4.go
@@ -135,3 +135,4 @@ func (v *NullableInlineObject4) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_5.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_5.go
index 974844007a7..055f4ff8fe2 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_5.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_object_5.go
@@ -143,3 +143,4 @@ func (v *NullableInlineObject5) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_response_default.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_response_default.go
index 19fb6bcd8a8..3c8ca5deafe 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_response_default.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_inline_response_default.go
@@ -111,3 +111,4 @@ func (v *NullableInlineResponseDefault) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_list.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_list.go
index 7966d7b337c..f49afaa71f3 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_list.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_list.go
@@ -111,3 +111,4 @@ func (v *NullableList) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_map_test_.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_map_test_.go
index 42724f8d875..4fc2c0b4799 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_map_test_.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_map_test_.go
@@ -219,3 +219,4 @@ func (v *NullableMapTest) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
index 21b7cb60ab4..69cc134169e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
@@ -184,3 +184,4 @@ func (v *NullableMixedPropertiesAndAdditionalPropertiesClass) UnmarshalJSON(src
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_name.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_name.go
index f910dc37c0c..82e49591874 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_name.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_name.go
@@ -212,3 +212,4 @@ func (v *NullableName) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go
index 0f3e7fb3a41..d2eb6062f6e 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go
@@ -28,8 +28,11 @@ type NullableClass struct {
 	ObjectNullableProp map[string]map[string]interface{} `json:"object_nullable_prop,omitempty"`
 	ObjectAndItemsNullableProp map[string]map[string]interface{} `json:"object_and_items_nullable_prop,omitempty"`
 	ObjectItemsNullable *map[string]map[string]interface{} `json:"object_items_nullable,omitempty"`
+	AdditionalProperties map[string]interface{}
 }
 
+type _NullableClass NullableClass
+
 // NewNullableClass instantiates a new NullableClass 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
@@ -533,9 +536,42 @@ func (o NullableClass) MarshalJSON() ([]byte, error) {
 	if o.ObjectItemsNullable != nil {
 		toSerialize["object_items_nullable"] = o.ObjectItemsNullable
 	}
+
+	for key, value := range o.AdditionalProperties {
+		toSerialize[key] = value
+	}
+
 	return json.Marshal(toSerialize)
 }
 
+func (o *NullableClass) UnmarshalJSON(bytes []byte) (err error) {
+	varNullableClass := _NullableClass{}
+
+	if err = json.Unmarshal(bytes, &varNullableClass); err == nil {
+		*o = NullableClass(varNullableClass)
+	}
+
+	additionalProperties := make(map[string]interface{})
+
+	if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
+		delete(additionalProperties, "integer_prop")
+		delete(additionalProperties, "number_prop")
+		delete(additionalProperties, "boolean_prop")
+		delete(additionalProperties, "string_prop")
+		delete(additionalProperties, "date_prop")
+		delete(additionalProperties, "datetime_prop")
+		delete(additionalProperties, "array_nullable_prop")
+		delete(additionalProperties, "array_and_items_nullable_prop")
+		delete(additionalProperties, "array_items_nullable")
+		delete(additionalProperties, "object_nullable_prop")
+		delete(additionalProperties, "object_and_items_nullable_prop")
+		delete(additionalProperties, "object_items_nullable")
+		o.AdditionalProperties = additionalProperties
+	}
+
+	return err
+}
+
 type NullableNullableClass struct {
 	value *NullableClass
 	isSet bool
@@ -572,3 +608,4 @@ func (v *NullableNullableClass) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_number_only.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_number_only.go
index 6307b2871e9..efa8b66a5bc 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_number_only.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_number_only.go
@@ -111,3 +111,4 @@ func (v *NullableNumberOnly) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_order.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_order.go
index 797c8e9236f..b20a1429848 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_order.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_order.go
@@ -297,3 +297,4 @@ func (v *NullableOrder) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_composite.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_composite.go
index 88049de0dac..9a76c753b64 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_composite.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_outer_composite.go
@@ -183,3 +183,4 @@ func (v *NullableOuterComposite) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_pet.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_pet.go
index 876af8724d7..8bc4457fc37 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_pet.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_pet.go
@@ -278,3 +278,4 @@ func (v *NullablePet) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_read_only_first.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_read_only_first.go
index af6291b4c82..dd00212c1d0 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_read_only_first.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_read_only_first.go
@@ -147,3 +147,4 @@ func (v *NullableReadOnlyFirst) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_return.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_return.go
index e6350da030c..2ed729e12ec 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_return.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_return.go
@@ -111,3 +111,4 @@ func (v *NullableReturn) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_tag.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_tag.go
index 0f8157a6b7a..99135ba946b 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_tag.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_tag.go
@@ -147,3 +147,4 @@ func (v *NullableTag) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_user.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_user.go
index f9824d767f2..ce40d756100 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_user.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_user.go
@@ -515,3 +515,4 @@ func (v *NullableUser) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_whale.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_whale.go
index faeb8187021..0b81bcfa7ad 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_whale.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_whale.go
@@ -176,3 +176,4 @@ func (v *NullableWhale) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_zebra.go b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_zebra.go
index b28b9d7d1db..82854d08834 100644
--- a/samples/openapi3/client/petstore/go-experimental/go-petstore/model_zebra.go
+++ b/samples/openapi3/client/petstore/go-experimental/go-petstore/model_zebra.go
@@ -140,3 +140,4 @@ func (v *NullableZebra) UnmarshalJSON(src []byte) error {
 	return json.Unmarshal(src, &v.value)
 }
 
+
diff --git a/samples/openapi3/client/petstore/go-experimental/model_test.go b/samples/openapi3/client/petstore/go-experimental/model_test.go
new file mode 100644
index 00000000000..46012d009e6
--- /dev/null
+++ b/samples/openapi3/client/petstore/go-experimental/model_test.go
@@ -0,0 +1,34 @@
+package main
+
+import (
+	"testing"
+    "encoding/json"
+	"github.com/stretchr/testify/assert"
+	sw "./go-petstore"
+)
+
+func TestBanana(t *testing.T) {
+    assert := assert.New(t)
+
+    lengthCm := float32(2.3)
+    lengthCm2 := float32(2.4)
+    newBanana := (sw.Banana{LengthCm: &lengthCm})
+    newBanana.LengthCm = &lengthCm2
+    assert.Equal(newBanana.LengthCm, &lengthCm2, "Banana LengthCm should be equal")
+
+    // test additioanl properties
+    jsonBanana:= `{"fruits":["apple","peach"],"lengthCm":3.1}`
+    jsonMap := make(map[string]interface{})
+    json.Unmarshal([]byte(jsonBanana), &jsonMap)
+
+    newBanana2 := (sw.Banana{})
+    lengthCm3 := float32(3.1)
+    json.Unmarshal([]byte(jsonBanana), &newBanana2)
+    assert.Equal(newBanana2.LengthCm, &lengthCm3, "Banana2 LengthCm should be equal")
+    assert.Equal(newBanana2.AdditionalProperties["fruits"], jsonMap["fruits"], "Banana2 AdditonalProperties should be equal")
+
+    newBanana2Json, _ := json.Marshal(newBanana2)
+    assert.Equal(string(newBanana2Json), jsonBanana, "Banana2 JSON string should be equal")
+
+}
+

From 5cf4ee1de842f37d582ddd83729dae4eb67d6ec0 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 11:37:56 +0800
Subject: [PATCH 13/22] add additional properties support to powershell client
 generator (#6528)

---
 .../codegen/languages/PowerShellClientCodegen.java |  4 ++++
 .../resources/powershell/model_simple.mustache     | 14 ++++++++++++++
 .../test/resources/3_0/powershell/petstore.yaml    |  1 +
 .../powershell/src/PSPetstore/Model/Tag.ps1        |  5 ++++-
 .../powershell/src/PSPetstore/PSPetstore.psd1      |  5 +++--
 5 files changed, 26 insertions(+), 3 deletions(-)

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 bcdf58f57fc..9c46377c097 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
@@ -922,6 +922,10 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
                 model.anyOf.remove("ModelNull");
             }
 
+            // add vendor extension for additonalProperties: true
+            if ("null<String, SystemCollectionsHashtable>".equals(model.parent)) {
+                model.vendorExtensions.put("x-additional-properties", true);
+            }
         }
 
         return objs;
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
index 6e7eadef78d..ab7098fe9f9 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_simple.mustache
@@ -129,13 +129,24 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
         $JsonParameters = ConvertFrom-Json -InputObject $Json
+        {{#vendorExtensions.x-additional-properties}}
+        ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties = @{}
+        {{/vendorExtensions.x-additional-properties}}
 
         # check if Json contains properties not defined in {{{apiNamePrefix}}}{{{classname}}}
         $AllProperties = ({{#allVars}}"{{{baseName}}}"{{^-last}}, {{/-last}}{{/allVars}})
         foreach ($name in $JsonParameters.PsObject.Properties.Name) {
+            {{^vendorExtensions.x-additional-properties}}
             if (!($AllProperties.Contains($name))) {
                 throw "Error! JSON key '$name' not found in the properties: $($AllProperties)"
             }
+            {{/vendorExtensions.x-additional-properties}}
+            {{#vendorExtensions.x-additional-properties}}
+            # store undefined properties in additionalProperties
+            if (!($AllProperties.Contains($name))) {
+                ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties[$name] = $JsonParameters.PSobject.Properties[$name].value
+            }
+            {{/vendorExtensions.x-additional-properties}}
         }
 
         {{#requiredVars}}
@@ -166,6 +177,9 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
             "<<baseName>>" = ${<<name>>}
             <</allVars>>
             <<={{ }}=>>
+            {{#vendorExtensions.x-additional-properties}}
+            "AdditionalProperties" = ${{{apiNamePrefix}}}{{{classname}}}AdditionalProperties
+            {{/vendorExtensions.x-additional-properties}}
         }
 
         return $PSO
diff --git a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
index 11ed2854ba5..b3a0dfd3c11 100644
--- a/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/powershell/petstore.yaml
@@ -699,6 +699,7 @@ components:
       xml:
         name: User
     Tag:
+      additionalProperties: true
       title: Pet Tag
       description: A tag for a pet
       type: object
diff --git a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1 b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
index 0f0044ef35c..8a7caf8d562 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
+++ b/samples/client/petstore/powershell/src/PSPetstore/Model/Tag.ps1
@@ -77,12 +77,14 @@ function ConvertFrom-PSJsonToTag {
         $PSBoundParameters | Out-DebugParameter | Write-Debug
 
         $JsonParameters = ConvertFrom-Json -InputObject $Json
+        $PSTagAdditionalProperties = @{}
 
         # check if Json contains properties not defined in PSTag
         $AllProperties = ("id", "name")
         foreach ($name in $JsonParameters.PsObject.Properties.Name) {
+            # store undefined properties in additionalProperties
             if (!($AllProperties.Contains($name))) {
-                throw "Error! JSON key '$name' not found in the properties: $($AllProperties)"
+                $PSTagAdditionalProperties[$name] = $JsonParameters.PSobject.Properties[$name].value
             }
         }
 
@@ -101,6 +103,7 @@ function ConvertFrom-PSJsonToTag {
         $PSO = [PSCustomObject]@{
             "id" = ${Id}
             "name" = ${Name}
+            "AdditionalProperties" = $PSTagAdditionalProperties
         }
 
         return $PSO
diff --git a/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1 b/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
index 9b7ca03faf5..7b9c725fae2 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
+++ b/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: OpenAPI Generator Team
 #
-# Generated on: 5/19/20
+# Generated on: 6/3/20
 #
 
 @{
@@ -87,7 +87,8 @@ FunctionsToExport = 'Add-PSPet', 'Remove-Pet', 'Find-PSPetsByStatus', 'Find-PSPe
                'Set-PSConfiguration', 'Set-PSConfigurationApiKey', 
                'Set-PSConfigurationApiKeyPrefix', 
                'Set-PSConfigurationDefaultHeader', 'Get-PSHostSetting', 
-               'Get-PSUrlFromHostSetting'
+               'Get-PSUrlFromHostSetting', 'Set-PSConfigurationHttpSigning', 
+               'Get-PSConfigurationHttpSigning'
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = @()

From a25359e91c0e8b5b19e7a2d38eadf5c431b940a2 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 11:46:16 +0800
Subject: [PATCH 14/22] comment out openapi3 java jersey2-java8 tests

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a6a76e3cd7..6dd6eb52a99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1264,7 +1264,7 @@
                 <module>samples/client/petstore/java/feign10x</module>
                 <module>samples/client/petstore/java/jersey1</module>
                 <module>samples/client/petstore/java/jersey2-java8</module>
-                <module>samples/openapi3/client/petstore/java/jersey2-java8</module>
+                <!--<module>samples/openapi3/client/petstore/java/jersey2-java8</module>-->
                 <module>samples/client/petstore/java/okhttp-gson</module>
                 <module>samples/client/petstore/java/retrofit2</module>
                 <module>samples/client/petstore/java/retrofit2rx</module>

From 859e7f7228ca1dcb2eb5902dc6142b5d50fd2b29 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 15:05:08 +0800
Subject: [PATCH 15/22] update pester to 5.x (#6536)

---
 appveyor.yml                                  |  2 +-
 .../resources/powershell/api_test.mustache    |  4 +-
 .../resources/powershell/model_test.mustache  |  4 +-
 .../powershell/.openapi-generator/FILES       | 11 +++
 .../powershell/src/PSPetstore/PSPetstore.psd1 |  2 +-
 .../powershell/tests/Api/PSPetApi.Tests.ps1   | 34 ++++----
 .../powershell/tests/Api/PSStoreApi.Tests.ps1 | 18 ++--
 .../powershell/tests/Api/PSUserApi.Tests.ps1  | 34 ++++----
 .../tests/Model/ApiResponse.Tests.ps1         |  4 +-
 .../powershell/tests/Model/Category.Tests.ps1 |  4 +-
 .../tests/Model/InlineObject.Tests.ps1        |  4 +-
 .../tests/Model/InlineObject1.Tests.ps1       |  4 +-
 .../powershell/tests/Model/Order.Tests.ps1    |  4 +-
 .../powershell/tests/Model/Pet.Tests.ps1      |  4 +-
 .../powershell/tests/Model/Tag.Tests.ps1      |  4 +-
 .../powershell/tests/Model/User.Tests.ps1     |  4 +-
 .../powershell/tests/Petstore.Tests.ps1       | 82 +++++++++----------
 17 files changed, 117 insertions(+), 106 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index d3c02aa19f1..0da5ff07a0c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,7 +32,7 @@ install:
   - git clone https://github.com/wing328/swagger-samples
   - ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
   - ps: $PSVersionTable.PSVersion
-  - ps: Install-Module Pester -Force -Scope CurrentUser -RequiredVersion 4.3.1
+  - ps: Install-Module Pester -Force -Scope CurrentUser
 build_script:
   - dotnet --info
   # build C# API client (netcore)
diff --git a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
index 52fe4b5f16f..9c3362aad55 100644
--- a/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/api_test.mustache
@@ -5,8 +5,8 @@ Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
     Context '{{{vendorExtensions.x-powershell-method-name}}}' {
         It 'Test {{{vendorExtensions.x-powershell-method-name}}}' {
             #$TestResult = Invoke-PetApiGetPetById{{#allParams}} -{{{paramName}}} "TEST_VALUE"{{/allParams}}
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_test.mustache b/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
index f2d67a306ea..411fd29efb8 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_test.mustache
@@ -6,8 +6,8 @@ Describe -tag '{{{packageName}}}' -name '{{{apiNamePrefix}}}{{{classname}}}' {
         It 'Initialize-{{{apiNamePrefix}}}{{{classname}}}' {
             # a simple test to create an object
             #$NewObject = Initialize-{{{apiNamePrefix}}}{{{classname}}}{{#vars}} -{{name}} "TEST_VALUE"{{/vars}}
-            #$NewObject | Should BeOfType {{classname}}
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType {{classname}}
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/.openapi-generator/FILES b/samples/client/petstore/powershell/.openapi-generator/FILES
index 4708e0914a5..2849a3267b9 100644
--- a/samples/client/petstore/powershell/.openapi-generator/FILES
+++ b/samples/client/petstore/powershell/.openapi-generator/FILES
@@ -31,3 +31,14 @@ src/PSPetstore/Private/PSApiClient.ps1
 src/PSPetstore/Private/PSHttpSignatureAuth.ps1
 src/PSPetstore/Private/PSRSAEncryptionProvider.cs
 src/PSPetstore/en-US/about_PSPetstore.help.txt
+tests/Api/PSPetApi.Tests.ps1
+tests/Api/PSStoreApi.Tests.ps1
+tests/Api/PSUserApi.Tests.ps1
+tests/Model/ApiResponse.Tests.ps1
+tests/Model/Category.Tests.ps1
+tests/Model/InlineObject.Tests.ps1
+tests/Model/InlineObject1.Tests.ps1
+tests/Model/Order.Tests.ps1
+tests/Model/Pet.Tests.ps1
+tests/Model/Tag.Tests.ps1
+tests/Model/User.Tests.ps1
diff --git a/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1 b/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
index 7b9c725fae2..4322e265be2 100644
--- a/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
+++ b/samples/client/petstore/powershell/src/PSPetstore/PSPetstore.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: OpenAPI Generator Team
 #
-# Generated on: 6/3/20
+# Generated on: 6/4/20
 #
 
 @{
diff --git a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
index 75635ae54f5..a64121dd996 100644
--- a/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSPetApi.Tests.ps1
@@ -5,68 +5,68 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'PSPetApi' {
+Describe -tag 'PSPetstore' -name 'PSPSPetApi' {
     Context 'Add-PSPet' {
         It 'Test Add-PSPet' {
             #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Remove-Pet' {
         It 'Test Remove-Pet' {
             #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -ApiKey "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Find-PSPetsByStatus' {
         It 'Test Find-PSPetsByStatus' {
             #$TestResult = Invoke-PetApiGetPetById -Status "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Find-PSPetsByTags' {
         It 'Test Find-PSPetsByTags' {
             #$TestResult = Invoke-PetApiGetPetById -Tags "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Get-PSPetById' {
         It 'Test Get-PSPetById' {
             #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Update-PSPet' {
         It 'Test Update-PSPet' {
             #$TestResult = Invoke-PetApiGetPetById -Pet "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Update-PSPetWithForm' {
         It 'Test Update-PSPetWithForm' {
             #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -Name "TEST_VALUE" -Status "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Invoke-PSUploadFile' {
         It 'Test Invoke-PSUploadFile' {
             #$TestResult = Invoke-PetApiGetPetById -PetId "TEST_VALUE" -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
diff --git a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
index de3c4226f94..95399b034f7 100644
--- a/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSStoreApi.Tests.ps1
@@ -5,36 +5,36 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'PSStoreApi' {
+Describe -tag 'PSPetstore' -name 'PSPSStoreApi' {
     Context 'Remove-PSOrder' {
         It 'Test Remove-PSOrder' {
             #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Get-PSInventory' {
         It 'Test Get-PSInventory' {
             #$TestResult = Invoke-PetApiGetPetById
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Get-PSOrderById' {
         It 'Test Get-PSOrderById' {
             #$TestResult = Invoke-PetApiGetPetById -OrderId "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Invoke-PSPlaceOrder' {
         It 'Test Invoke-PSPlaceOrder' {
             #$TestResult = Invoke-PetApiGetPetById -Order "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
diff --git a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1 b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
index 757592bd932..6a7f50b9f57 100644
--- a/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Api/PSUserApi.Tests.ps1
@@ -5,68 +5,68 @@
 # Generated by OpenAPI Generator: https://openapi-generator.tech
 #
 
-Describe -tag 'PSPetstore' -name 'PSUserApi' {
+Describe -tag 'PSPetstore' -name 'PSPSUserApi' {
     Context 'New-PSUser' {
         It 'Test New-PSUser' {
             #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'New-PSUsersWithArrayInput' {
         It 'Test New-PSUsersWithArrayInput' {
             #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'New-PSUsersWithListInput' {
         It 'Test New-PSUsersWithListInput' {
             #$TestResult = Invoke-PetApiGetPetById -User "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Remove-PSUser' {
         It 'Test Remove-PSUser' {
             #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Get-PSUserByName' {
         It 'Test Get-PSUserByName' {
             #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Invoke-PSLoginUser' {
         It 'Test Invoke-PSLoginUser' {
             #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -Password "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Invoke-PSLogoutUser' {
         It 'Test Invoke-PSLogoutUser' {
             #$TestResult = Invoke-PetApiGetPetById
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
     Context 'Update-PSUser' {
         It 'Test Update-PSUser' {
             #$TestResult = Invoke-PetApiGetPetById -Username "TEST_VALUE" -User "TEST_VALUE"
-            #$TestResult | Should BeOfType TODO
-            #$TestResult.property | Should Be 0
+            #$TestResult | Should -BeOfType TODO
+            #$TestResult.property | Should -Be 0
         }
     }
 
diff --git a/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
index e0c9985b2d9..79252634714 100644
--- a/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/ApiResponse.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSApiResponse' {
         It 'Initialize-PSApiResponse' {
             # a simple test to create an object
             #$NewObject = Initialize-PSApiResponse -Code "TEST_VALUE" -Type "TEST_VALUE" -Message "TEST_VALUE"
-            #$NewObject | Should BeOfType ApiResponse
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType ApiResponse
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
index b405e070643..b4782f412b4 100644
--- a/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Category.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSCategory' {
         It 'Initialize-PSCategory' {
             # a simple test to create an object
             #$NewObject = Initialize-PSCategory -Id "TEST_VALUE" -Name "TEST_VALUE"
-            #$NewObject | Should BeOfType Category
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType Category
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
index aa18bd03aad..ff544575a27 100644
--- a/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/InlineObject.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSInlineObject' {
         It 'Initialize-PSInlineObject' {
             # a simple test to create an object
             #$NewObject = Initialize-PSInlineObject -Name "TEST_VALUE" -Status "TEST_VALUE"
-            #$NewObject | Should BeOfType InlineObject
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType InlineObject
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
index 1435f1826f4..01af66de646 100644
--- a/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/InlineObject1.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSInlineObject1' {
         It 'Initialize-PSInlineObject1' {
             # a simple test to create an object
             #$NewObject = Initialize-PSInlineObject1 -AdditionalMetadata "TEST_VALUE" -File "TEST_VALUE"
-            #$NewObject | Should BeOfType InlineObject1
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType InlineObject1
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
index 2c24df69c58..5bf036e01fa 100644
--- a/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Order.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSOrder' {
         It 'Initialize-PSOrder' {
             # a simple test to create an object
             #$NewObject = Initialize-PSOrder -Id "TEST_VALUE" -PetId "TEST_VALUE" -Quantity "TEST_VALUE" -ShipDate "TEST_VALUE" -Status "TEST_VALUE" -Complete "TEST_VALUE"
-            #$NewObject | Should BeOfType Order
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType Order
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
index 5cfcdc67e83..1f6e189b836 100644
--- a/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Pet.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSPet' {
         It 'Initialize-PSPet' {
             # a simple test to create an object
             #$NewObject = Initialize-PSPet -Id "TEST_VALUE" -Category "TEST_VALUE" -Name "TEST_VALUE" -PhotoUrls "TEST_VALUE" -Tags "TEST_VALUE" -Status "TEST_VALUE"
-            #$NewObject | Should BeOfType Pet
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType Pet
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
index d2e0b220380..ae168f27dc7 100644
--- a/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/Tag.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSTag' {
         It 'Initialize-PSTag' {
             # a simple test to create an object
             #$NewObject = Initialize-PSTag -Id "TEST_VALUE" -Name "TEST_VALUE"
-            #$NewObject | Should BeOfType Tag
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType Tag
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Model/User.Tests.ps1 b/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
index 2919e4adb4b..1c9f4d6dee4 100644
--- a/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Model/User.Tests.ps1
@@ -10,8 +10,8 @@ Describe -tag 'PSPetstore' -name 'PSUser' {
         It 'Initialize-PSUser' {
             # a simple test to create an object
             #$NewObject = Initialize-PSUser -Id "TEST_VALUE" -Username "TEST_VALUE" -FirstName "TEST_VALUE" -LastName "TEST_VALUE" -Email "TEST_VALUE" -Password "TEST_VALUE" -Phone "TEST_VALUE" -UserStatus "TEST_VALUE"
-            #$NewObject | Should BeOfType User
-            #$NewObject.property | Should Be 0
+            #$NewObject | Should -BeOfType User
+            #$NewObject.property | Should -Be 0
         }
     }
 }
diff --git a/samples/client/petstore/powershell/tests/Petstore.Tests.ps1 b/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
index cfcb506984d..09e8b9a7771 100644
--- a/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
+++ b/samples/client/petstore/powershell/tests/Petstore.Tests.ps1
@@ -23,21 +23,21 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
             
             # Get 
             $Result = Get-PSPetById -petId $Id
-            $Result."id" | Should Be 38369
-            $Result."name" | Should Be "PowerShell"
-            $Result."status" | Should Be "Available"
-            $Result."category"."id" | Should Be $Id
-            $Result."category"."name" | Should Be 'PSCategory'
+            $Result."id" | Should -Be 38369
+            $Result."name" | Should -Be "PowerShell"
+            $Result."status" | Should -Be "Available"
+            $Result."category"."id" | Should -Be $Id
+            $Result."category"."name" | Should -Be 'PSCategory'
 
-            $Result.GetType().fullname | Should Be "System.Management.Automation.PSCustomObject"
+            $Result.GetType().fullname | Should -Be "System.Management.Automation.PSCustomObject"
 
             # Update (form)
             $Result = Update-PSPetWithForm -petId $Id -Name "PowerShell Update" -Status "Pending"
 
             $Result = Get-PSPetById -petId $Id
-            $Result."id" | Should Be 38369
-            $Result."name" | Should Be "PowerShell Update"
-            $Result."status" | Should Be "Pending"
+            $Result."id" | Should -Be 38369
+            $Result."name" | Should -Be "PowerShell Update"
+            $Result."status" | Should -Be "Pending"
 
             # Update (put)
             $NewPet = Initialize-PSPet -Id $Id -Name 'PowerShell2' -Category (
@@ -51,13 +51,13 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
 
             $Result = Update-PSPet -Pet $NewPet
             $Result = Get-PSPetById -petId $Id -WithHttpInfo
-            $Result.GetType().fullname | Should Be "System.Collections.Hashtable"
-            #$Result["Response"].GetType().fullanme | Should Be "System.Management.Automation.PSCustomObject"
-            $Result["Response"]."id" | Should Be 38369
-            $Result["Response"]."name" | Should Be "PowerShell2"
-            $Result["Response"]."status" | Should Be "Sold"
-            $Result["StatusCode"] | Should Be 200
-            $Result["Headers"]["Content-Type"] | Should Be "application/json"
+            $Result.GetType().fullname | Should -Be "System.Collections.Hashtable"
+            #$Result["Response"].GetType().fullanme | Should -Be "System.Management.Automation.PSCustomObject"
+            $Result["Response"]."id" | Should -Be 38369
+            $Result["Response"]."name" | Should -Be "PowerShell2"
+            $Result["Response"]."status" | Should -Be "Sold"
+            $Result["StatusCode"] | Should -Be 200
+            $Result["Headers"]["Content-Type"] | Should -Be "application/json"
 
             # upload file
             $file = Get-Item "./plus.gif"
@@ -72,8 +72,8 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
 
             $Result = Update-PSPet -Pet $NewPet
             $Result = Get-PSPetById -petId $NewPet."id" -WithHttpInfo
-            $Result["Response"]."id" | Should Be $NewPet."id"
-            $Result["Response"]."name" | Should Be $NewPet."name"
+            $Result["Response"]."id" | Should -Be $NewPet."id"
+            $Result["Response"]."name" | Should -Be $NewPet."name"
 
             # Delete
             $Result = Remove-Pet -petId $Id
@@ -109,19 +109,19 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
             
              # test find pets by tags 
              $Results = Find-PSPetsByTags 'bazbaz'
-             $Results.GetType().FullName| Should Be "System.Object[]"
-             $Results.Count | Should Be 2
+             $Results.GetType().FullName| Should -Be "System.Object[]"
+             $Results.Count | Should -Be 2
 
              if ($Results[0]."id" -gt 10129) {
-                 $Results[0]."id" | Should Be 20129
+                 $Results[0]."id" | Should -Be 20129
              } else {
-                 $Results[0]."id" | Should Be 10129
+                 $Results[0]."id" | Should -Be 10129
              }
 
              if ($Results[1]."id" -gt 10129) {
-                 $Results[1]."id" | Should Be 20129
+                 $Results[1]."id" | Should -Be 20129
              } else {
-                 $Results[1]."id" | Should Be 10129
+                 $Results[1]."id" | Should -Be 10129
              }
 
         }
@@ -132,22 +132,22 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
 
             $HS = Get-PSHostSetting
 
-            $HS[0]["Url"] | Should Be "http://{server}.swagger.io:{port}/v2"
-            $HS[0]["Description"] | Should Be "petstore server"
-            $HS[0]["Variables"]["server"]["Description"] | Should Be "No description provided"
-            $HS[0]["Variables"]["server"]["DefaultValue"] | Should Be "petstore"
-            $HS[0]["Variables"]["server"]["EnumValues"] | Should Be @("petstore",
+            $HS[0]["Url"] | Should -Be "http://{server}.swagger.io:{port}/v2"
+            $HS[0]["Description"] | Should -Be "petstore server"
+            $HS[0]["Variables"]["server"]["Description"] | Should -Be "No description provided"
+            $HS[0]["Variables"]["server"]["DefaultValue"] | Should -Be "petstore"
+            $HS[0]["Variables"]["server"]["EnumValues"] | Should -Be @("petstore",
                     "qa-petstore",
                     "dev-petstore")
 
         }
 
         It "Get-PSUrlFromHostSetting tests" {
-            Get-PSUrlFromHostSetting -Index 0 | Should Be "http://petstore.swagger.io:80/v2"
-            Get-PSUrlFromHostSetting -Index 0 -Variables @{ "port" = "8080" } | Should Be "http://petstore.swagger.io:8080/v2" 
+            Get-PSUrlFromHostSetting -Index 0 | Should -Be "http://petstore.swagger.io:80/v2"
+            Get-PSUrlFromHostSetting -Index 0 -Variables @{ "port" = "8080" } | Should -Be "http://petstore.swagger.io:8080/v2" 
             #Get-PSUrlFromHostSetting -Index 2 | Should -Throw -ExceptionType ([RuntimeException]) 
-            #Get-PSUrlFromHostSetting -Index 2 -ErrorAction Stop | Should -Throw "RuntimeException: Invalid index 2 when selecting the host. Must be less than 2"
-            #Get-PSUrlFromHostSetting -Index 0 -Variables @{ "port" = "1234" } -ErrorAction Stop | Should -Throw "RuntimeException: The variable 'port' in the host URL has invalid value 1234. Must be 80,8080"
+            #Get-PSUrlFromHostSetting -Index 2 -ErrorAction Stop | Should -Throw "RuntimeException: Invalid index 2 when selecting the host. Must -Be less than 2"
+            #Get-PSUrlFromHostSetting -Index 0 -Variables @{ "port" = "1234" } -ErrorAction Stop | Should -Throw "RuntimeException: The variable 'port' in the host URL has invalid value 1234. Must -Be 80,8080"
 
         }
 
@@ -156,16 +156,16 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
             Set-PSConfigurationDefaultHeader -Key "TestKey" -Value "TestValue"
 
             $Configuration = Get-PSConfiguration
-            $Configuration["DefaultHeaders"].Count | Should Be 1
-            $Configuration["DefaultHeaders"]["TestKey"] | Should Be "TestValue"
+            $Configuration["DefaultHeaders"].Count | Should -Be 1
+            $Configuration["DefaultHeaders"]["TestKey"] | Should -Be "TestValue"
 
         }
 
         It "Configuration tests" {
             $Conf = Get-PSConfiguration
-            $Conf["SkipCertificateCheck"] | Should Be $false
+            $Conf["SkipCertificateCheck"] | Should -Be $false
             $Conf = Set-PSConfiguration -PassThru -SkipCertificateCheck
-            $Conf["SkipCertificateCheck"] | Should Be $true
+            $Conf["SkipCertificateCheck"] | Should -Be $true
             $Conf = Set-PSConfiguration -PassThru # reset SkipCertificateCheck
         }
 
@@ -179,10 +179,10 @@ Describe -tag 'PSOpenAPITools' -name 'Integration Tests' {
         It "Create Object from JSON tests" {
             $Result = ConvertFrom-PSJsonToPet '{"id": 345, "name": "json name test", "status": "available", "photoUrls": ["https://photo.test"]}'
 
-            $Result."id" | Should Be 345
-            $Result."name" | Should Be "json name test"
-            $Result."status" | Should Be "available"
-            $Result."photoUrls" | Should Be @("https://photo.test")
+            $Result."id" | Should -Be 345
+            $Result."name" | Should -Be "json name test"
+            $Result."status" | Should -Be "available"
+            $Result."photoUrls" | Should -Be @("https://photo.test")
 
         }
     }

From 83a0f7d65bfc9e3c976f8c59ef2996dddb688976 Mon Sep 17 00:00:00 2001
From: Reijhanniel Jearl Campos <devcsrj@apache.org>
Date: Thu, 4 Jun 2020 20:24:51 +0800
Subject: [PATCH 16/22] Fix incorrect npx command (#6537)

The current `npx ` command says to use:

```
npx openapi-generator generate -i petstore.yaml -g ruby -o /tmp/test/
```

This however, pulls a similarly-named but different project: [zhang740/openapi-generator](https://www.npmjs.com/package/openapi-generator).

This commit fixes this, by using the appropriate package `@openapitools/openapi-generator-cli`
---
 docs/installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installation.md b/docs/installation.md
index f3015d1e7a1..697764a1470 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -33,7 +33,7 @@ npm install @openapitools/openapi-generator-cli -D
 Then, **generate** a ruby client from a valid [petstore.yaml](https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml) doc:
 
 ```bash
-npx openapi-generator generate -i petstore.yaml -g ruby -o /tmp/test/
+npx @openapitools/openapi-generator-cli generate -i petstore.yaml -g ruby -o /tmp/test/
 ```
 
 > `npx` will execute a globally available `openapi-generator`, and if not found it will fall back to project-local commands. The result is that the above command will work regardless of which installation method you've chosen.

From 0f627e70fbf314b66250c3bb0b8d0eb2e4fb5cfa Mon Sep 17 00:00:00 2001
From: Samuel Kahn <48932506+Kahncode@users.noreply.github.com>
Date: Thu, 4 Jun 2020 14:37:39 +0200
Subject: [PATCH 17/22] [C++][Ue4] various bus fixes (#6539)

* Fixed compilation on linux and UE4.23

* Added string and enum type definition support

* Better handling or variable names, should avoid conflicts with reserved keywords or empty variable names in edge cases

* Updated samples
---
 .../languages/CppUE4ClientCodegen.java        |  13 +-
 .../main/resources/cpp-ue4/Build.cs.mustache  |   1 +
 .../cpp-ue4/api-operations-header.mustache    |   2 +-
 .../resources/cpp-ue4/helpers-header.mustache | 137 +++++++++---------
 .../resources/cpp-ue4/helpers-source.mustache |   1 +
 .../cpp-ue4/model-base-header.mustache        |   4 +-
 .../resources/cpp-ue4/model-header.mustache   |  19 ++-
 .../resources/cpp-ue4/model-source.mustache   |  70 ++++++++-
 .../client/petstore/cpp-ue4/OpenAPI.Build.cs  |   1 +
 .../cpp-ue4/Private/OpenAPIApiResponse.cpp    |  13 +-
 .../cpp-ue4/Private/OpenAPICategory.cpp       |  11 +-
 .../cpp-ue4/Private/OpenAPIHelpers.cpp        |   1 +
 .../petstore/cpp-ue4/Private/OpenAPIOrder.cpp |  19 ++-
 .../petstore/cpp-ue4/Private/OpenAPIPet.cpp   |  19 ++-
 .../petstore/cpp-ue4/Private/OpenAPITag.cpp   |  11 +-
 .../petstore/cpp-ue4/Private/OpenAPIUser.cpp  |  23 +--
 .../cpp-ue4/Public/OpenAPIApiResponse.h       |   2 +-
 .../cpp-ue4/Public/OpenAPIBaseModel.h         |   4 +-
 .../petstore/cpp-ue4/Public/OpenAPICategory.h |   2 +-
 .../petstore/cpp-ue4/Public/OpenAPIHelpers.h  | 137 +++++++++---------
 .../petstore/cpp-ue4/Public/OpenAPIOrder.h    |   2 +-
 .../petstore/cpp-ue4/Public/OpenAPIPet.h      |   2 +-
 .../cpp-ue4/Public/OpenAPIPetApiOperations.h  |  16 +-
 .../Public/OpenAPIStoreApiOperations.h        |   8 +-
 .../petstore/cpp-ue4/Public/OpenAPITag.h      |   2 +-
 .../petstore/cpp-ue4/Public/OpenAPIUser.h     |   2 +-
 .../cpp-ue4/Public/OpenAPIUserApiOperations.h |  16 +-
 27 files changed, 325 insertions(+), 213 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
index 064b5282f62..dd71b9008f7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppUE4ClientCodegen.java
@@ -497,13 +497,20 @@ public class CppUE4ClientCodegen extends AbstractCppCodegen {
             name = name.toLowerCase(Locale.ROOT);
         }
 
+        //Unreal variable names are CamelCase
+        String camelCaseName = camelize(name, false);
+
+        //Avoid empty variable name at all costs
+        if(!camelCaseName.isEmpty()) {
+            name = camelCaseName;
+        }
+
         // for reserved word or word starting with number, append _
         if (isReservedWord(name) || name.matches("^\\d.*")) {
             name = escapeReservedWord(name);
         }
-
-        //Unreal variable names are CamelCase
-        return camelize(name, false);
+        
+        return name;
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache
index a6fe9bd84ec..9b33c5d3d57 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/Build.cs.mustache
@@ -15,5 +15,6 @@ public class {{unrealModuleName}} : ModuleRules
                 "Json",
             }
         );
+        PCHUsage = PCHUsageMode.NoPCHs;
     }
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-header.mustache
index 1486ef60e2c..bd168101e38 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/api-operations-header.mustache
@@ -52,7 +52,7 @@ public:
 	{{#responses.0}}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
 	{{/responses.0}}
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     {{#returnType}}{{{returnType}}} Content;{{/returnType}}
 };
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache
index adbff0c0e88..1750a6f8e95 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-header.mustache
@@ -6,6 +6,7 @@
 #include "Serialization/JsonSerializer.h"
 #include "Dom/JsonObject.h"
 #include "Misc/Base64.h"
+#include "PlatformHttp.h"
 
 class IHttpRequest;
 
@@ -196,10 +197,22 @@ inline FString CollectionToUrlString_multi(const TArray<T>& Collection, const TC
 
 //////////////////////////////////////////////////////////////////////////
 
-template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
-inline void WriteJsonValue(JsonWriter& Writer, const T& Value)
+inline void WriteJsonValue(JsonWriter& Writer, const TSharedPtr<FJsonObject>& Value)
 {
-	Writer->WriteValue(Value);
+	if (Value.IsValid())
+	{
+		FJsonSerializer::Serialize(Value.ToSharedRef(), Writer, false);
+	}
+	else
+	{
+		Writer->WriteObjectStart();
+		Writer->WriteObjectEnd();
+	}
+}
+
+inline void WriteJsonValue(JsonWriter& Writer, const TArray<uint8>& Value)
+{
+	Writer->WriteValue(ToString(Value));
 }
 
 inline void WriteJsonValue(JsonWriter& Writer, const FDateTime& Value)
@@ -212,6 +225,12 @@ inline void WriteJsonValue(JsonWriter& Writer, const Model& Value)
 	Value.WriteJson(Writer);
 }
 
+template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
+inline void WriteJsonValue(JsonWriter& Writer, const T& Value)
+{
+	Writer->WriteValue(Value);
+}
+
 template<typename T>
 inline void WriteJsonValue(JsonWriter& Writer, const TArray<T>& Value)
 {
@@ -235,54 +254,8 @@ inline void WriteJsonValue(JsonWriter& Writer, const TMap<FString, T>& Value)
 	Writer->WriteObjectEnd();
 }
 
-inline void WriteJsonValue(JsonWriter& Writer, const TSharedPtr<FJsonObject>& Value)
-{
-	if (Value.IsValid())
-	{
-		FJsonSerializer::Serialize(Value.ToSharedRef(), Writer, false);
-	}
-	else
-	{
-		Writer->WriteObjectStart();
-		Writer->WriteObjectEnd();
-	}
-}
-
-inline void WriteJsonValue(JsonWriter& Writer, const TArray<uint8>& Value)
-{
-	Writer->WriteValue(ToString(Value));
-}
-
 //////////////////////////////////////////////////////////////////////////
 
-template<typename T>
-inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, T& Value)
-{
-	const TSharedPtr<FJsonValue> JsonValue = JsonObject->TryGetField(Key);
-	if (JsonValue.IsValid() && !JsonValue->IsNull())
-	{
-		return TryGetJsonValue(JsonValue, Value);
-	}
-	return false;
-}
-
-template<typename T>
-inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, TOptional<T>& OptionalValue)
-{
-	if(JsonObject->HasField(Key))
-	{
-		T Value;
-		if (TryGetJsonValue(JsonObject, Key, Value))
-		{
-			OptionalValue = Value;
-			return true;
-		}
-		else
-			return false;
-	}
-	return true; // Absence of optional value is not a parsing error
-}
-
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, FString& Value)
 {
 	FString TmpValue;
@@ -316,6 +289,34 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, bool& Value
 		return false;
 }
 
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TSharedPtr<FJsonObject>& JsonObjectValue)
+{
+	const TSharedPtr<FJsonObject>* Object;
+	if (JsonValue->TryGetObject(Object))
+	{
+		JsonObjectValue = *Object;
+		return true;
+	}
+	return false;
+}
+
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<uint8>& Value)
+{
+	FString TmpValue;
+	if (JsonValue->TryGetString(TmpValue))
+	{
+		Base64UrlDecode(TmpValue, Value);
+		return true;
+	}
+	else
+		return false;
+}
+
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, Model& Value)
+{
+	return Value.FromJson(JsonValue);
+}
+
 template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, T& Value)
 {
@@ -329,15 +330,6 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, T& Value)
 		return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, Model& Value)
-{
-	const TSharedPtr<FJsonObject>* Object;
-	if (JsonValue->TryGetObject(Object))
-		return Value.FromJson(*Object);
-	else
-		return false;
-}
-
 template<typename T>
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<T>& ArrayValue)
 {
@@ -377,27 +369,32 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TMap<FStrin
 	return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TSharedPtr<FJsonObject>& JsonObjectValue)
+template<typename T>
+inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, T& Value)
 {
-	const TSharedPtr<FJsonObject>* Object;
-	if (JsonValue->TryGetObject(Object))
+	const TSharedPtr<FJsonValue> JsonValue = JsonObject->TryGetField(Key);
+	if (JsonValue.IsValid() && !JsonValue->IsNull())
 	{
-		JsonObjectValue = *Object;
-		return true;
+		return TryGetJsonValue(JsonValue, Value);
 	}
 	return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<uint8>& Value)
+template<typename T>
+inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, TOptional<T>& OptionalValue)
 {
-	FString TmpValue;
-	if (JsonValue->TryGetString(TmpValue))
+	if(JsonObject->HasField(Key))
 	{
-		Base64UrlDecode(TmpValue, Value);
-		return true;
+		T Value;
+		if (TryGetJsonValue(JsonObject, Key, Value))
+		{
+			OptionalValue = Value;
+			return true;
+		}
+		else
+			return false;
 	}
-	else
-		return false;
+	return true; // Absence of optional value is not a parsing error
 }
 
 {{#cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-source.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-source.mustache
index 1ae8bad54c6..ea97911bbd9 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/helpers-source.mustache
@@ -6,6 +6,7 @@
 #include "Interfaces/IHttpRequest.h"
 #include "PlatformHttp.h"
 #include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
 
 {{#cppNamespaceDeclarations}}
 namespace {{this}} 
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache
index 67280bde989..94edaaf4327 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/model-base-header.mustache
@@ -18,7 +18,7 @@ class {{dllapi}} Model
 public:
 	virtual ~Model() {}
 	virtual void WriteJson(JsonWriter& Writer) const = 0;
-	virtual bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) = 0;
+	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) = 0;
 };
 
 class {{dllapi}} Request
@@ -33,7 +33,7 @@ class {{dllapi}} Response
 {
 public:
 	virtual ~Response() {}
-	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) = 0;
+	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) = 0;
 
 	void SetSuccessful(bool InSuccessful) { Successful = InSuccessful; }
 	bool IsSuccessful() const { return Successful; }
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache
index 6af8c720f0e..900dcf7f318 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/model-header.mustache
@@ -21,9 +21,26 @@ class {{dllapi}} {{classname}} : public Model
 {
 public:
     virtual ~{{classname}}() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
+	{{#isString}}
+	{{#isEnum}}
+	{{#allowableValues}}
+	enum class Values
+	{
+		{{#enumVars}}
+		{{name}},
+		{{/enumVars}}
+  	};
+
+	Values Value{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}};
+	{{/allowableValues}}
+	{{/isEnum}}
+	{{^isEnum}}
+	FString Value{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}};
+	{{/isEnum}}
+	{{/isString}}
     {{#vars}}
 	{{#isEnum}}
 	{{#allowableValues}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-ue4/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-ue4/model-source.mustache
index 3e9b14788a6..f26df2ec50f 100644
--- a/modules/openapi-generator/src/main/resources/cpp-ue4/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-ue4/model-source.mustache
@@ -11,6 +11,54 @@ namespace {{this}}
 {
 {{/cppNamespaceDeclarations}}
 {{#models}}{{#model}}
+{{#isEnum}}
+inline FString ToString(const {{classname}}::Values& Value)
+{
+	{{#allowableValues}}
+	switch (Value)
+	{
+	{{#enumVars}}
+	case {{classname}}::Values::{{name}}:
+		return TEXT({{{value}}});
+	{{/enumVars}}
+	}
+	{{/allowableValues}}
+
+	UE_LOG(Log{{unrealModuleName}}, Error, TEXT("Invalid {{classname}}::Values Value (%d)"), (int)Value);	
+	return TEXT("");
+}
+
+inline FStringFormatArg ToStringFormatArg(const {{classname}}::Values& Value)
+{
+	return FStringFormatArg(ToString(Value));
+}
+
+inline void WriteJsonValue(JsonWriter& Writer, const {{classname}}::Values& Value)
+{
+	WriteJsonValue(Writer, ToString(Value));
+}
+
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, {{classname}}::Values& Value)
+{
+	{{#allowableValues}}
+	FString TmpValue;
+	if (JsonValue->TryGetString(TmpValue))
+	{
+		static TMap<FString, {{classname}}::Values> StringToEnum = { {{#enumVars}}
+			{ TEXT({{{value}}}), {{classname}}::Values::{{name}} },{{/enumVars}} };
+
+		const auto Found = StringToEnum.Find(TmpValue);
+		if(Found)
+		{
+			Value = *Found;
+			return true;
+		}
+	}
+	{{/allowableValues}}
+	return false;
+}
+
+{{/isEnum}}
 {{#hasEnums}}
 {{#vars}}
 {{#isEnum}}
@@ -65,9 +113,10 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, {{classname
 {{/hasEnums}}
 void {{classname}}::WriteJson(JsonWriter& Writer) const
 {
-	{{#parent}}
-	#error inheritance not handled right now
-	{{/parent}}
+	{{#isString}}
+	WriteJsonValue(Writer, Value);
+	{{/isString}}
+	{{^isString}}
 	Writer->WriteObjectStart();
     {{#vars}}
 	{{#required}}
@@ -81,18 +130,29 @@ void {{classname}}::WriteJson(JsonWriter& Writer) const
 	{{/required}}
     {{/vars}}
 	Writer->WriteObjectEnd();
+	{{/isString}}
 }
 
-bool {{classname}}::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool {{classname}}::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	{{#isString}}
+	return TryGetJsonValue(JsonValue, Value);
+	{{/isString}}
+	{{^isString}}
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
     {{#vars}}
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("{{baseName}}"), {{name}});
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("{{baseName}}"), {{name}});
     {{/vars}}
 
 	return ParseSuccess;
+	{{/isString}}
 }
+
 {{/model}}
 {{/models}}
 {{#cppNamespaceDeclarations}}
diff --git a/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs b/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs
index 48294bae4e4..f6d2f83eba8 100644
--- a/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs
+++ b/samples/client/petstore/cpp-ue4/OpenAPI.Build.cs
@@ -26,5 +26,6 @@ public class OpenAPI : ModuleRules
                 "Json",
             }
         );
+        PCHUsage = PCHUsageMode.NoPCHs;
     }
 }
\ No newline at end of file
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp
index 54254095989..bd248608e46 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIApiResponse.cpp
@@ -38,14 +38,19 @@ void OpenAPIApiResponse::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPIApiResponse::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPIApiResponse::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("code"), Code);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("type"), Type);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("message"), Message);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("code"), Code);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("type"), Type);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("message"), Message);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp
index 2f3b816d3c9..109decaa0df 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPICategory.cpp
@@ -34,13 +34,18 @@ void OpenAPICategory::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPICategory::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPICategory::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("id"), Id);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("name"), Name);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("id"), Id);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("name"), Name);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp
index 0a3be0adee2..7361ddf5fe3 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIHelpers.cpp
@@ -17,6 +17,7 @@
 #include "Interfaces/IHttpRequest.h"
 #include "PlatformHttp.h"
 #include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
 
 namespace OpenAPI 
 {
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp
index f125c7ae40b..4442b2a1c10 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIOrder.cpp
@@ -96,17 +96,22 @@ void OpenAPIOrder::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPIOrder::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPIOrder::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("id"), Id);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("petId"), PetId);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("quantity"), Quantity);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("shipDate"), ShipDate);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("status"), Status);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("complete"), Complete);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("id"), Id);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("petId"), PetId);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("quantity"), Quantity);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("shipDate"), ShipDate);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("status"), Status);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("complete"), Complete);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp
index b36df84ae6b..9cc4f201362 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIPet.cpp
@@ -90,17 +90,22 @@ void OpenAPIPet::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPIPet::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPIPet::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("id"), Id);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("category"), Category);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("name"), Name);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("photoUrls"), PhotoUrls);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("tags"), Tags);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("status"), Status);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("id"), Id);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("category"), Category);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("name"), Name);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("photoUrls"), PhotoUrls);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("tags"), Tags);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("status"), Status);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp
index 4f399573c7e..4714f75bf53 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPITag.cpp
@@ -34,13 +34,18 @@ void OpenAPITag::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPITag::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPITag::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("id"), Id);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("name"), Name);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("id"), Id);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("name"), Name);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp b/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp
index bb0fe0292bf..90eb9fc9b43 100644
--- a/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp
+++ b/samples/client/petstore/cpp-ue4/Private/OpenAPIUser.cpp
@@ -58,19 +58,24 @@ void OpenAPIUser::WriteJson(JsonWriter& Writer) const
 	Writer->WriteObjectEnd();
 }
 
-bool OpenAPIUser::FromJson(const TSharedPtr<FJsonObject>& JsonObject)
+bool OpenAPIUser::FromJson(const TSharedPtr<FJsonValue>& JsonValue)
 {
+	const TSharedPtr<FJsonObject>* Object;
+	if (!JsonValue->TryGetObject(Object))
+		return false;
+
 	bool ParseSuccess = true;
 
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("id"), Id);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("username"), Username);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("firstName"), FirstName);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("lastName"), LastName);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("email"), Email);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("password"), Password);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("phone"), Phone);
-	ParseSuccess &= TryGetJsonValue(JsonObject, TEXT("userStatus"), UserStatus);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("id"), Id);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("username"), Username);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("firstName"), FirstName);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("lastName"), LastName);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("email"), Email);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("password"), Password);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("phone"), Phone);
+	ParseSuccess &= TryGetJsonValue(*Object, TEXT("userStatus"), UserStatus);
 
 	return ParseSuccess;
 }
+
 }
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h
index 9eca3a5e273..2924d49d26e 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIApiResponse.h
@@ -26,7 +26,7 @@ class OPENAPI_API OpenAPIApiResponse : public Model
 {
 public:
     virtual ~OpenAPIApiResponse() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int32> Code;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h
index 26efc0d9c6a..defa1b49263 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIBaseModel.h
@@ -27,7 +27,7 @@ class OPENAPI_API Model
 public:
 	virtual ~Model() {}
 	virtual void WriteJson(JsonWriter& Writer) const = 0;
-	virtual bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) = 0;
+	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) = 0;
 };
 
 class OPENAPI_API Request
@@ -42,7 +42,7 @@ class OPENAPI_API Response
 {
 public:
 	virtual ~Response() {}
-	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) = 0;
+	virtual bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) = 0;
 
 	void SetSuccessful(bool InSuccessful) { Successful = InSuccessful; }
 	bool IsSuccessful() const { return Successful; }
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h b/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h
index b375f23e71a..a38dd8a632d 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPICategory.h
@@ -26,7 +26,7 @@ class OPENAPI_API OpenAPICategory : public Model
 {
 public:
     virtual ~OpenAPICategory() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int64> Id;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h
index 42c7c6bd122..74e9e079610 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIHelpers.h
@@ -17,6 +17,7 @@
 #include "Serialization/JsonSerializer.h"
 #include "Dom/JsonObject.h"
 #include "Misc/Base64.h"
+#include "PlatformHttp.h"
 
 class IHttpRequest;
 
@@ -205,10 +206,22 @@ inline FString CollectionToUrlString_multi(const TArray<T>& Collection, const TC
 
 //////////////////////////////////////////////////////////////////////////
 
-template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
-inline void WriteJsonValue(JsonWriter& Writer, const T& Value)
+inline void WriteJsonValue(JsonWriter& Writer, const TSharedPtr<FJsonObject>& Value)
 {
-	Writer->WriteValue(Value);
+	if (Value.IsValid())
+	{
+		FJsonSerializer::Serialize(Value.ToSharedRef(), Writer, false);
+	}
+	else
+	{
+		Writer->WriteObjectStart();
+		Writer->WriteObjectEnd();
+	}
+}
+
+inline void WriteJsonValue(JsonWriter& Writer, const TArray<uint8>& Value)
+{
+	Writer->WriteValue(ToString(Value));
 }
 
 inline void WriteJsonValue(JsonWriter& Writer, const FDateTime& Value)
@@ -221,6 +234,12 @@ inline void WriteJsonValue(JsonWriter& Writer, const Model& Value)
 	Value.WriteJson(Writer);
 }
 
+template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
+inline void WriteJsonValue(JsonWriter& Writer, const T& Value)
+{
+	Writer->WriteValue(Value);
+}
+
 template<typename T>
 inline void WriteJsonValue(JsonWriter& Writer, const TArray<T>& Value)
 {
@@ -244,54 +263,8 @@ inline void WriteJsonValue(JsonWriter& Writer, const TMap<FString, T>& Value)
 	Writer->WriteObjectEnd();
 }
 
-inline void WriteJsonValue(JsonWriter& Writer, const TSharedPtr<FJsonObject>& Value)
-{
-	if (Value.IsValid())
-	{
-		FJsonSerializer::Serialize(Value.ToSharedRef(), Writer, false);
-	}
-	else
-	{
-		Writer->WriteObjectStart();
-		Writer->WriteObjectEnd();
-	}
-}
-
-inline void WriteJsonValue(JsonWriter& Writer, const TArray<uint8>& Value)
-{
-	Writer->WriteValue(ToString(Value));
-}
-
 //////////////////////////////////////////////////////////////////////////
 
-template<typename T>
-inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, T& Value)
-{
-	const TSharedPtr<FJsonValue> JsonValue = JsonObject->TryGetField(Key);
-	if (JsonValue.IsValid() && !JsonValue->IsNull())
-	{
-		return TryGetJsonValue(JsonValue, Value);
-	}
-	return false;
-}
-
-template<typename T>
-inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, TOptional<T>& OptionalValue)
-{
-	if(JsonObject->HasField(Key))
-	{
-		T Value;
-		if (TryGetJsonValue(JsonObject, Key, Value))
-		{
-			OptionalValue = Value;
-			return true;
-		}
-		else
-			return false;
-	}
-	return true; // Absence of optional value is not a parsing error
-}
-
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, FString& Value)
 {
 	FString TmpValue;
@@ -325,6 +298,34 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, bool& Value
 		return false;
 }
 
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TSharedPtr<FJsonObject>& JsonObjectValue)
+{
+	const TSharedPtr<FJsonObject>* Object;
+	if (JsonValue->TryGetObject(Object))
+	{
+		JsonObjectValue = *Object;
+		return true;
+	}
+	return false;
+}
+
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<uint8>& Value)
+{
+	FString TmpValue;
+	if (JsonValue->TryGetString(TmpValue))
+	{
+		Base64UrlDecode(TmpValue, Value);
+		return true;
+	}
+	else
+		return false;
+}
+
+inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, Model& Value)
+{
+	return Value.FromJson(JsonValue);
+}
+
 template<typename T, typename std::enable_if<!std::is_base_of<Model, T>::value, int>::type = 0>
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, T& Value)
 {
@@ -338,15 +339,6 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, T& Value)
 		return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, Model& Value)
-{
-	const TSharedPtr<FJsonObject>* Object;
-	if (JsonValue->TryGetObject(Object))
-		return Value.FromJson(*Object);
-	else
-		return false;
-}
-
 template<typename T>
 inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<T>& ArrayValue)
 {
@@ -386,27 +378,32 @@ inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TMap<FStrin
 	return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TSharedPtr<FJsonObject>& JsonObjectValue)
+template<typename T>
+inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, T& Value)
 {
-	const TSharedPtr<FJsonObject>* Object;
-	if (JsonValue->TryGetObject(Object))
+	const TSharedPtr<FJsonValue> JsonValue = JsonObject->TryGetField(Key);
+	if (JsonValue.IsValid() && !JsonValue->IsNull())
 	{
-		JsonObjectValue = *Object;
-		return true;
+		return TryGetJsonValue(JsonValue, Value);
 	}
 	return false;
 }
 
-inline bool TryGetJsonValue(const TSharedPtr<FJsonValue>& JsonValue, TArray<uint8>& Value)
+template<typename T>
+inline bool TryGetJsonValue(const TSharedPtr<FJsonObject>& JsonObject, const FString& Key, TOptional<T>& OptionalValue)
 {
-	FString TmpValue;
-	if (JsonValue->TryGetString(TmpValue))
+	if(JsonObject->HasField(Key))
 	{
-		Base64UrlDecode(TmpValue, Value);
-		return true;
+		T Value;
+		if (TryGetJsonValue(JsonObject, Key, Value))
+		{
+			OptionalValue = Value;
+			return true;
+		}
+		else
+			return false;
 	}
-	else
-		return false;
+	return true; // Absence of optional value is not a parsing error
 }
 
 }
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h
index e3207190e29..f8bcaadde53 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIOrder.h
@@ -26,7 +26,7 @@ class OPENAPI_API OpenAPIOrder : public Model
 {
 public:
     virtual ~OpenAPIOrder() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int64> Id;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h
index 0e81e5fe0f9..b916d319819 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIPet.h
@@ -28,7 +28,7 @@ class OPENAPI_API OpenAPIPet : public Model
 {
 public:
     virtual ~OpenAPIPet() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int64> Id;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h
index a93365d9546..5b5c2511869 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIPetApiOperations.h
@@ -41,7 +41,7 @@ class OPENAPI_API OpenAPIPetApi::AddPetResponse : public Response
 public:
     virtual ~AddPetResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -66,7 +66,7 @@ class OPENAPI_API OpenAPIPetApi::DeletePetResponse : public Response
 public:
     virtual ~DeletePetResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -97,7 +97,7 @@ class OPENAPI_API OpenAPIPetApi::FindPetsByStatusResponse : public Response
 public:
     virtual ~FindPetsByStatusResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     TArray<OpenAPIPet> Content;
 };
@@ -122,7 +122,7 @@ class OPENAPI_API OpenAPIPetApi::FindPetsByTagsResponse : public Response
 public:
     virtual ~FindPetsByTagsResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     TArray<OpenAPIPet> Content;
 };
@@ -147,7 +147,7 @@ class OPENAPI_API OpenAPIPetApi::GetPetByIdResponse : public Response
 public:
     virtual ~GetPetByIdResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     OpenAPIPet Content;
 };
@@ -171,7 +171,7 @@ class OPENAPI_API OpenAPIPetApi::UpdatePetResponse : public Response
 public:
     virtual ~UpdatePetResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -199,7 +199,7 @@ class OPENAPI_API OpenAPIPetApi::UpdatePetWithFormResponse : public Response
 public:
     virtual ~UpdatePetWithFormResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -227,7 +227,7 @@ class OPENAPI_API OpenAPIPetApi::UploadFileResponse : public Response
 public:
     virtual ~UploadFileResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     OpenAPIApiResponse Content;
 };
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
index 06e6809c185..84a4fd6cf0e 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIStoreApiOperations.h
@@ -40,7 +40,7 @@ class OPENAPI_API OpenAPIStoreApi::DeleteOrderResponse : public Response
 public:
     virtual ~DeleteOrderResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -63,7 +63,7 @@ class OPENAPI_API OpenAPIStoreApi::GetInventoryResponse : public Response
 public:
     virtual ~GetInventoryResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     TMap<FString, int32> Content;
 };
@@ -88,7 +88,7 @@ class OPENAPI_API OpenAPIStoreApi::GetOrderByIdResponse : public Response
 public:
     virtual ~GetOrderByIdResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     OpenAPIOrder Content;
 };
@@ -112,7 +112,7 @@ class OPENAPI_API OpenAPIStoreApi::PlaceOrderResponse : public Response
 public:
     virtual ~PlaceOrderResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     OpenAPIOrder Content;
 };
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h b/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h
index 72bc6d130da..ab8a2646beb 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPITag.h
@@ -26,7 +26,7 @@ class OPENAPI_API OpenAPITag : public Model
 {
 public:
     virtual ~OpenAPITag() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int64> Id;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h
index 55494d8ec0b..fe4e1affa9f 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIUser.h
@@ -26,7 +26,7 @@ class OPENAPI_API OpenAPIUser : public Model
 {
 public:
     virtual ~OpenAPIUser() {}
-	bool FromJson(const TSharedPtr<FJsonObject>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
 	void WriteJson(JsonWriter& Writer) const final;
 
 	TOptional<int64> Id;
diff --git a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h
index 3e050a41ef0..8c287474ed3 100644
--- a/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h
+++ b/samples/client/petstore/cpp-ue4/Public/OpenAPIUserApiOperations.h
@@ -40,7 +40,7 @@ class OPENAPI_API OpenAPIUserApi::CreateUserResponse : public Response
 public:
     virtual ~CreateUserResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -64,7 +64,7 @@ class OPENAPI_API OpenAPIUserApi::CreateUsersWithArrayInputResponse : public Res
 public:
     virtual ~CreateUsersWithArrayInputResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -88,7 +88,7 @@ class OPENAPI_API OpenAPIUserApi::CreateUsersWithListInputResponse : public Resp
 public:
     virtual ~CreateUsersWithListInputResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -113,7 +113,7 @@ class OPENAPI_API OpenAPIUserApi::DeleteUserResponse : public Response
 public:
     virtual ~DeleteUserResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -137,7 +137,7 @@ class OPENAPI_API OpenAPIUserApi::GetUserByNameResponse : public Response
 public:
     virtual ~GetUserByNameResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     OpenAPIUser Content;
 };
@@ -163,7 +163,7 @@ class OPENAPI_API OpenAPIUserApi::LoginUserResponse : public Response
 public:
     virtual ~LoginUserResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     FString Content;
 };
@@ -185,7 +185,7 @@ class OPENAPI_API OpenAPIUserApi::LogoutUserResponse : public Response
 public:
     virtual ~LogoutUserResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };
@@ -212,7 +212,7 @@ class OPENAPI_API OpenAPIUserApi::UpdateUserResponse : public Response
 public:
     virtual ~UpdateUserResponse() {}
 	void SetHttpResponseCode(EHttpResponseCodes::Type InHttpResponseCode) final;
-	bool FromJson(const TSharedPtr<FJsonValue>& JsonObject) final;
+	bool FromJson(const TSharedPtr<FJsonValue>& JsonValue) final;
     
     
 };

From 176c439a6d51d3a3f514e2e7fbae7b6f513f677f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 21:13:42 +0800
Subject: [PATCH 18/22] [PS] automatically derive discriminator mapping for
 oneOf/anyOf  (#6542)

* infer mapping based on oneOf/anyOf schemas

* update files
---
 .../languages/PowerShellClientCodegen.java    | 21 +++++++++++++++++++
 .../resources/powershell/model_anyof.mustache |  2 +-
 .../resources/powershell/model_oneof.mustache |  2 +-
 .../powershell/.openapi-generator/FILES       | 11 ----------
 4 files changed, 23 insertions(+), 13 deletions(-)

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 9c46377c097..d3e519a9a7f 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
@@ -926,6 +926,27 @@ public class PowerShellClientCodegen extends DefaultCodegen implements CodegenCo
             if ("null<String, SystemCollectionsHashtable>".equals(model.parent)) {
                 model.vendorExtensions.put("x-additional-properties", true);
             }
+
+            // automatically create discriminator mapping for oneOf/anyOf if not present
+            if (((model.oneOf != null && !model.oneOf.isEmpty()) || (model.anyOf != null && !model.anyOf.isEmpty())) &&
+                    model.discriminator != null && model.discriminator.getMapping() == null) {
+                // create mappedModels
+                Set<String> schemas = new HashSet<>();
+                if (model.oneOf != null && !model.oneOf.isEmpty()) {
+                    schemas = model.oneOf;
+                } else if (model.anyOf != null && !model.anyOf.isEmpty()) {
+                    schemas = model.anyOf;
+                }
+
+                HashSet<CodegenDiscriminator.MappedModel> mappedModels = new HashSet<>();
+
+                for (String s: schemas) {
+                    mappedModels.add(new CodegenDiscriminator.MappedModel(s, s));
+                }
+
+                model.discriminator.setMappedModels(mappedModels);
+
+            }
         }
 
         return objs;
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache b/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
index a3310c354b3..62991addbe2 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_anyof.mustache
@@ -44,7 +44,7 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
         $JsonData = ConvertFrom-Json -InputObject $Json
         {{/-first}}
         # check if the discriminator value is '{{{mappingName}}}'
-        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value == "{{{mappingName}}}") {
+        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value -eq "{{{mappingName}}}") {
             # try to match {{{modelName}}} defined in the anyOf schemas
             try {
                 $matchInstance = ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{modelName}}} $Json
diff --git a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
index 4bda9700eab..e71d77814d2 100644
--- a/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
+++ b/modules/openapi-generator/src/main/resources/powershell/model_oneof.mustache
@@ -45,7 +45,7 @@ function ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{classname}}} {
         $JsonData = ConvertFrom-Json -InputObject $Json
         {{/-first}}
         # check if the discriminator value is '{{{mappingName}}}'
-        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value == "{{{mappingName}}}") {
+        if ($JsonData.PSobject.Properties["{{{propertyBaseName}}}"].value -eq "{{{mappingName}}}") {
             # try to match {{{modelName}}} defined in the oneOf schemas
             try {
                 $matchInstance = ConvertFrom-{{{apiNamePrefix}}}JsonTo{{{modelName}}} $Json
diff --git a/samples/client/petstore/powershell/.openapi-generator/FILES b/samples/client/petstore/powershell/.openapi-generator/FILES
index 2849a3267b9..4708e0914a5 100644
--- a/samples/client/petstore/powershell/.openapi-generator/FILES
+++ b/samples/client/petstore/powershell/.openapi-generator/FILES
@@ -31,14 +31,3 @@ src/PSPetstore/Private/PSApiClient.ps1
 src/PSPetstore/Private/PSHttpSignatureAuth.ps1
 src/PSPetstore/Private/PSRSAEncryptionProvider.cs
 src/PSPetstore/en-US/about_PSPetstore.help.txt
-tests/Api/PSPetApi.Tests.ps1
-tests/Api/PSStoreApi.Tests.ps1
-tests/Api/PSUserApi.Tests.ps1
-tests/Model/ApiResponse.Tests.ps1
-tests/Model/Category.Tests.ps1
-tests/Model/InlineObject.Tests.ps1
-tests/Model/InlineObject1.Tests.ps1
-tests/Model/Order.Tests.ps1
-tests/Model/Pet.Tests.ps1
-tests/Model/Tag.Tests.ps1
-tests/Model/User.Tests.ps1

From ae790ea74e99c7410c77ba157481fe81375a7c70 Mon Sep 17 00:00:00 2001
From: Bruno Coelho <4brunu@users.noreply.github.com>
Date: Thu, 4 Jun 2020 14:29:08 +0100
Subject: [PATCH 19/22] [kotlin][client] remove tabs usage (#6526)

* [kotlin] remove tabs

* [kotlin][client] update pet projects
---
 .../kotlin-client/data_class.mustache         |   6 +-
 .../kotlin-client/enum_class.mustache         |  10 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../.openapi-generator/FILES                  | 122 ++++++++++++++++
 .../.openapi-generator/VERSION                |   2 +-
 .../docs/FakeApi.md                           |   8 +-
 .../models/AdditionalPropertiesClass.kt       |   6 +-
 .../org/openapitools/client/models/Animal.kt  |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../client/models/ArrayOfArrayOfNumberOnly.kt |   6 +-
 .../client/models/ArrayOfNumberOnly.kt        |   6 +-
 .../openapitools/client/models/ArrayTest.kt   |   6 +-
 .../client/models/Capitalization.kt           |   6 +-
 .../org/openapitools/client/models/Cat.kt     |   6 +-
 .../openapitools/client/models/CatAllOf.kt    |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../openapitools/client/models/ClassModel.kt  |   6 +-
 .../org/openapitools/client/models/Client.kt  |   6 +-
 .../org/openapitools/client/models/Dog.kt     |   6 +-
 .../openapitools/client/models/DogAllOf.kt    |   6 +-
 .../openapitools/client/models/EnumArrays.kt  |   6 +-
 .../openapitools/client/models/EnumClass.kt   |  10 +-
 .../openapitools/client/models/EnumTest.kt    |   6 +-
 .../client/models/FileSchemaTestClass.kt      |   6 +-
 .../org/openapitools/client/models/Foo.kt     |   6 +-
 .../openapitools/client/models/FormatTest.kt  |   6 +-
 .../client/models/HasOnlyReadOnly.kt          |   6 +-
 .../client/models/HealthCheckResult.kt        |   6 +-
 .../client/models/InlineObject.kt             |   6 +-
 .../client/models/InlineObject1.kt            |   6 +-
 .../client/models/InlineObject2.kt            |   6 +-
 .../client/models/InlineObject3.kt            |   6 +-
 .../client/models/InlineObject4.kt            |   6 +-
 .../client/models/InlineObject5.kt            |   6 +-
 .../client/models/InlineResponseDefault.kt    |   6 +-
 .../org/openapitools/client/models/List.kt    |   6 +-
 .../org/openapitools/client/models/MapTest.kt |   6 +-
 ...dPropertiesAndAdditionalPropertiesClass.kt |   6 +-
 .../client/models/Model200Response.kt         |   6 +-
 .../org/openapitools/client/models/Name.kt    |   6 +-
 .../client/models/NullableClass.kt            |   6 +-
 .../openapitools/client/models/NumberOnly.kt  |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../client/models/OuterComposite.kt           |   6 +-
 .../openapitools/client/models/OuterEnum.kt   |  10 +-
 .../client/models/OuterEnumDefaultValue.kt    |  10 +-
 .../client/models/OuterEnumInteger.kt         |  10 +-
 .../models/OuterEnumIntegerDefaultValue.kt    |  10 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../client/models/ReadOnlyFirst.kt            |   6 +-
 .../org/openapitools/client/models/Return.kt  |   6 +-
 .../client/models/SpecialModelname.kt         |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../.openapi-generator/FILES                  | 122 ++++++++++++++++
 .../.openapi-generator/VERSION                |   2 +-
 .../kotlin-jvm-retrofit2-rx/docs/FakeApi.md   |   8 +-
 .../models/AdditionalPropertiesClass.kt       |   6 +-
 .../org/openapitools/client/models/Animal.kt  |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../client/models/ArrayOfArrayOfNumberOnly.kt |   6 +-
 .../client/models/ArrayOfNumberOnly.kt        |   6 +-
 .../openapitools/client/models/ArrayTest.kt   |   6 +-
 .../client/models/Capitalization.kt           |   6 +-
 .../org/openapitools/client/models/Cat.kt     |   6 +-
 .../openapitools/client/models/CatAllOf.kt    |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../openapitools/client/models/ClassModel.kt  |   6 +-
 .../org/openapitools/client/models/Client.kt  |   6 +-
 .../org/openapitools/client/models/Dog.kt     |   6 +-
 .../openapitools/client/models/DogAllOf.kt    |   6 +-
 .../openapitools/client/models/EnumArrays.kt  |   6 +-
 .../openapitools/client/models/EnumClass.kt   |  10 +-
 .../openapitools/client/models/EnumTest.kt    |   6 +-
 .../client/models/FileSchemaTestClass.kt      |   6 +-
 .../org/openapitools/client/models/Foo.kt     |   6 +-
 .../openapitools/client/models/FormatTest.kt  |   6 +-
 .../client/models/HasOnlyReadOnly.kt          |   6 +-
 .../client/models/HealthCheckResult.kt        |   6 +-
 .../client/models/InlineObject.kt             |   6 +-
 .../client/models/InlineObject1.kt            |   6 +-
 .../client/models/InlineObject2.kt            |   6 +-
 .../client/models/InlineObject3.kt            |   6 +-
 .../client/models/InlineObject4.kt            |   6 +-
 .../client/models/InlineObject5.kt            |   6 +-
 .../client/models/InlineResponseDefault.kt    |   6 +-
 .../org/openapitools/client/models/List.kt    |   6 +-
 .../org/openapitools/client/models/MapTest.kt |   6 +-
 ...dPropertiesAndAdditionalPropertiesClass.kt |   6 +-
 .../client/models/Model200Response.kt         |   6 +-
 .../org/openapitools/client/models/Name.kt    |   6 +-
 .../client/models/NullableClass.kt            |   6 +-
 .../openapitools/client/models/NumberOnly.kt  |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../client/models/OuterComposite.kt           |   6 +-
 .../openapitools/client/models/OuterEnum.kt   |  10 +-
 .../client/models/OuterEnumDefaultValue.kt    |  10 +-
 .../client/models/OuterEnumInteger.kt         |  10 +-
 .../models/OuterEnumIntegerDefaultValue.kt    |  10 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../client/models/ReadOnlyFirst.kt            |   6 +-
 .../org/openapitools/client/models/Return.kt  |   6 +-
 .../client/models/SpecialModelname.kt         |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../.openapi-generator/FILES                  | 122 ++++++++++++++++
 .../.openapi-generator/VERSION                |   2 +-
 .../kotlin-jvm-retrofit2-rx2/docs/FakeApi.md  |   8 +-
 .../models/AdditionalPropertiesClass.kt       |   6 +-
 .../org/openapitools/client/models/Animal.kt  |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../client/models/ArrayOfArrayOfNumberOnly.kt |   6 +-
 .../client/models/ArrayOfNumberOnly.kt        |   6 +-
 .../openapitools/client/models/ArrayTest.kt   |   6 +-
 .../client/models/Capitalization.kt           |   6 +-
 .../org/openapitools/client/models/Cat.kt     |   6 +-
 .../openapitools/client/models/CatAllOf.kt    |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../openapitools/client/models/ClassModel.kt  |   6 +-
 .../org/openapitools/client/models/Client.kt  |   6 +-
 .../org/openapitools/client/models/Dog.kt     |   6 +-
 .../openapitools/client/models/DogAllOf.kt    |   6 +-
 .../openapitools/client/models/EnumArrays.kt  |   6 +-
 .../openapitools/client/models/EnumClass.kt   |  10 +-
 .../openapitools/client/models/EnumTest.kt    |   6 +-
 .../client/models/FileSchemaTestClass.kt      |   6 +-
 .../org/openapitools/client/models/Foo.kt     |   6 +-
 .../openapitools/client/models/FormatTest.kt  |   6 +-
 .../client/models/HasOnlyReadOnly.kt          |   6 +-
 .../client/models/HealthCheckResult.kt        |   6 +-
 .../client/models/InlineObject.kt             |   6 +-
 .../client/models/InlineObject1.kt            |   6 +-
 .../client/models/InlineObject2.kt            |   6 +-
 .../client/models/InlineObject3.kt            |   6 +-
 .../client/models/InlineObject4.kt            |   6 +-
 .../client/models/InlineObject5.kt            |   6 +-
 .../client/models/InlineResponseDefault.kt    |   6 +-
 .../org/openapitools/client/models/List.kt    |   6 +-
 .../org/openapitools/client/models/MapTest.kt |   6 +-
 ...dPropertiesAndAdditionalPropertiesClass.kt |   6 +-
 .../client/models/Model200Response.kt         |   6 +-
 .../org/openapitools/client/models/Name.kt    |   6 +-
 .../client/models/NullableClass.kt            |   6 +-
 .../openapitools/client/models/NumberOnly.kt  |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../client/models/OuterComposite.kt           |   6 +-
 .../openapitools/client/models/OuterEnum.kt   |  10 +-
 .../client/models/OuterEnumDefaultValue.kt    |  10 +-
 .../client/models/OuterEnumInteger.kt         |  10 +-
 .../models/OuterEnumIntegerDefaultValue.kt    |  10 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../client/models/ReadOnlyFirst.kt            |   6 +-
 .../org/openapitools/client/models/Return.kt  |   6 +-
 .../client/models/SpecialModelname.kt         |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 .../.openapi-generator/FILES                  | 135 ++++++++++++++++++
 .../.openapi-generator/VERSION                |   2 +-
 .../kotlin-multiplatform/docs/FakeApi.md      |   8 +-
 .../gradle/wrapper/gradle-wrapper.jar         | Bin 53639 -> 91141 bytes
 .../org/openapitools/client/apis/FakeApi.kt   |   8 +-
 .../openapitools/client/models/EnumClass.kt   |  10 +-
 .../openapitools/client/models/OuterEnum.kt   |  10 +-
 .../client/models/OuterEnumDefaultValue.kt    |  10 +-
 .../client/models/OuterEnumInteger.kt         |  10 +-
 .../models/OuterEnumIntegerDefaultValue.kt    |  10 +-
 .../petstore/kotlin/.openapi-generator/FILES  | 128 +++++++++++++++++
 .../kotlin/.openapi-generator/VERSION         |   2 +-
 .../client/petstore/kotlin/docs/FakeApi.md    |   8 +-
 .../org/openapitools/client/apis/FakeApi.kt   |   8 +-
 .../org/openapitools/client/apis/PetApi.kt    |   1 +
 .../models/AdditionalPropertiesClass.kt       |   6 +-
 .../org/openapitools/client/models/Animal.kt  |   6 +-
 .../openapitools/client/models/ApiResponse.kt |   6 +-
 .../client/models/ArrayOfArrayOfNumberOnly.kt |   6 +-
 .../client/models/ArrayOfNumberOnly.kt        |   6 +-
 .../openapitools/client/models/ArrayTest.kt   |   6 +-
 .../client/models/Capitalization.kt           |   6 +-
 .../org/openapitools/client/models/Cat.kt     |   6 +-
 .../openapitools/client/models/CatAllOf.kt    |   6 +-
 .../openapitools/client/models/Category.kt    |   6 +-
 .../openapitools/client/models/ClassModel.kt  |   6 +-
 .../org/openapitools/client/models/Client.kt  |   6 +-
 .../org/openapitools/client/models/Dog.kt     |   6 +-
 .../openapitools/client/models/DogAllOf.kt    |   6 +-
 .../openapitools/client/models/EnumArrays.kt  |   6 +-
 .../openapitools/client/models/EnumClass.kt   |  10 +-
 .../openapitools/client/models/EnumTest.kt    |   6 +-
 .../client/models/FileSchemaTestClass.kt      |   6 +-
 .../org/openapitools/client/models/Foo.kt     |   6 +-
 .../openapitools/client/models/FormatTest.kt  |   6 +-
 .../client/models/HasOnlyReadOnly.kt          |   6 +-
 .../client/models/HealthCheckResult.kt        |   6 +-
 .../client/models/InlineObject.kt             |   6 +-
 .../client/models/InlineObject1.kt            |   6 +-
 .../client/models/InlineObject2.kt            |   6 +-
 .../client/models/InlineObject3.kt            |   6 +-
 .../client/models/InlineObject4.kt            |   6 +-
 .../client/models/InlineObject5.kt            |   6 +-
 .../client/models/InlineResponseDefault.kt    |   6 +-
 .../org/openapitools/client/models/List.kt    |   6 +-
 .../org/openapitools/client/models/MapTest.kt |   6 +-
 ...dPropertiesAndAdditionalPropertiesClass.kt |   6 +-
 .../client/models/Model200Response.kt         |   6 +-
 .../org/openapitools/client/models/Name.kt    |   6 +-
 .../client/models/NullableClass.kt            |   6 +-
 .../openapitools/client/models/NumberOnly.kt  |   6 +-
 .../org/openapitools/client/models/Order.kt   |   6 +-
 .../client/models/OuterComposite.kt           |   6 +-
 .../openapitools/client/models/OuterEnum.kt   |  10 +-
 .../client/models/OuterEnumDefaultValue.kt    |  10 +-
 .../client/models/OuterEnumInteger.kt         |  10 +-
 .../models/OuterEnumIntegerDefaultValue.kt    |  10 +-
 .../org/openapitools/client/models/Pet.kt     |   6 +-
 .../client/models/ReadOnlyFirst.kt            |   6 +-
 .../org/openapitools/client/models/Return.kt  |   6 +-
 .../client/models/SpecialModelname.kt         |   6 +-
 .../org/openapitools/client/models/Tag.kt     |   6 +-
 .../org/openapitools/client/models/User.kt    |   6 +-
 242 files changed, 1384 insertions(+), 754 deletions(-)
 create mode 100644 samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
 create mode 100644 samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
 create mode 100644 samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
 create mode 100644 samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
 create mode 100644 samples/openapi3/client/petstore/kotlin/.openapi-generator/FILES

diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index ec0fdf07b2d..e1f5062f2e2 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -48,9 +48,9 @@ import java.io.Serializable
 ){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMapModel}}(){{/isMapModel}}{{#isArrayModel}}(){{/isArrayModel}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} {
 {{/vendorExtensions.x-has-data-class-body}}
 {{#serializableModel}}
-	{{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    {{#nonPublicApi}}internal {{/nonPublicApi}}companion object {
+        private const val serialVersionUID: Long = 123
+    }
 {{/serializableModel}}
 {{#discriminator}}{{#vars}}{{#required}}
 {{>interface_req_var}}{{/required}}{{^required}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
index 4704fcfabf8..8de73d46049 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
@@ -47,11 +47,11 @@ import kotlinx.serialization.internal.CommonEnumSerializer
 
 {{/enumVars}}{{/allowableValues}}
 
-	/**
-	This override toString avoids using the enum var name and uses the actual api value instead.
-	In cases the var name and value are different, the client would send incorrect enums to the server.
-	**/
-	override fun toString(): String {
+    /**
+    This override toString avoids using the enum var name and uses the actual api value instead.
+    In cases the var name and value are different, the client would send incorrect enums to the server.
+    **/
+    override fun toString(): String {
         return value{{^isString}}.toString(){{/isString}}
     }
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index b4c9c9b7674..83b19bd556f 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @SerializedName("message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
index 6dfe689dd04..60962ece7d4 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @SerializedName("name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
index 0a049435cdb..474530938cf 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0290ccbb124..2fc4113d205 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @SerializedName("status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 68c1ca9365f..0e178691762 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @SerializedName("name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
index 32eaba94d25..daa32971736 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index eed5027e801..3c715519085 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @Json(name = "message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
index f29e6833057..07955e4ff49 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2b92b4375d1..d5048059d44 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
index bb0a5df6e19..0f72fb6bd36 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
index aa93e435695..fa228fbe1f4 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
index 7487ed927d1..d02cbd91abd 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index eed5027e801..3c715519085 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @Json(name = "message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index f29e6833057..07955e4ff49 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index 847b3ff5e28..c71bb5bda0d 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index d3a480e2f14..0dd3a58bcae 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index aa93e435695..fa228fbe1f4 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
index 7487ed927d1..d02cbd91abd 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index eed5027e801..3c715519085 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @Json(name = "message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index f29e6833057..07955e4ff49 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2b92b4375d1..d5048059d44 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index bb0a5df6e19..0f72fb6bd36 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index aa93e435695..fa228fbe1f4 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index 7487ed927d1..d02cbd91abd 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
new file mode 100644
index 00000000000..63cd1381e9d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/FILES
@@ -0,0 +1,122 @@
+.openapi-generator-ignore
+README.md
+build.gradle
+docs/200Response.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+settings.gradle
+src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
+src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
+src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Animal.kt
+src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+src/main/kotlin/org/openapitools/client/models/Cat.kt
+src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+src/main/kotlin/org/openapitools/client/models/Category.kt
+src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+src/main/kotlin/org/openapitools/client/models/Client.kt
+src/main/kotlin/org/openapitools/client/models/Dog.kt
+src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+src/main/kotlin/org/openapitools/client/models/Foo.kt
+src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+src/main/kotlin/org/openapitools/client/models/List.kt
+src/main/kotlin/org/openapitools/client/models/MapTest.kt
+src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+src/main/kotlin/org/openapitools/client/models/Name.kt
+src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/Order.kt
+src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/Pet.kt
+src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+src/main/kotlin/org/openapitools/client/models/Return.kt
+src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+src/main/kotlin/org/openapitools/client/models/Tag.kt
+src/main/kotlin/org/openapitools/client/models/User.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/VERSION b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/VERSION
index b5d898602c2..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
index fb663183f92..0a28947aa84 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/docs/FakeApi.md
@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 6d216739f0b..04e474059f2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -26,9 +26,9 @@ data class AdditionalPropertiesClass (
     @SerializedName("map_of_map_property")
     val mapOfMapProperty: kotlin.collections.Map<kotlin.String, kotlin.collections.Map<kotlin.String, kotlin.String>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 86992f00d6a..59234b2684f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -21,9 +21,9 @@ import java.io.Serializable
  */
 
 interface Animal : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     @get:SerializedName("className")
     val className: kotlin.String
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 15ea8f6ce57..4d49a464621 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @SerializedName("message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 02723cb9dcd..0c88337e9c1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
     val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index afde31b7ff4..4da5b8e6d5f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
     val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index d9946e24ba4..855cd60a327 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -30,9 +30,9 @@ data class ArrayTest (
     @SerializedName("array_array_of_model")
     val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index a7c7d3c9a76..24e13278871 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -39,9 +39,9 @@ data class Capitalization (
     @SerializedName("ATT_NAME")
     val ATT_NAME: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 3c0b6063ce1..7470f250432 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -31,9 +31,9 @@ data class Cat (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 7b42c1e2f51..17d5df7c0db 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -23,9 +23,9 @@ data class CatAllOf (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
index eddd17dc023..6bfa3b0d01f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @SerializedName("id")
     val id: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index d4ca6d61241..174d49148f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -23,9 +23,9 @@ data class ClassModel (
     @SerializedName("_class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
index 2823f40b88b..31fa6e51bf7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -23,9 +23,9 @@ data class Client (
     @SerializedName("client")
     val client: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
index fbc06cf1dd6..7965fadd703 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -31,9 +31,9 @@ data class Dog (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index c422756a65f..d67d72c0967 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -23,9 +23,9 @@ data class DogAllOf (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index 8ffe63f244b..d4ffb01a388 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -26,9 +26,9 @@ data class EnumArrays (
     @SerializedName("array_enum")
     val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
index 2eccf5d72fa..f5edeb3710f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
@@ -35,11 +35,11 @@ enum class EnumClass(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index a939ed3f41a..507fbaa3c05 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -48,9 +48,9 @@ data class EnumTest (
     @SerializedName("outerEnumIntegerDefaultValue")
     val outerEnumIntegerDefaultValue: OuterEnumIntegerDefaultValue? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 8ccd536e097..1511af5d49b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -26,9 +26,9 @@ data class FileSchemaTestClass (
     @SerializedName("files")
     val files: kotlin.Array<java.io.File>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
index eac43b98525..1ca746f908c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -23,9 +23,9 @@ data class Foo (
     @SerializedName("bar")
     val bar: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index f8f4fd03128..5b9be0b89c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -67,9 +67,9 @@ data class FormatTest (
     @SerializedName("pattern_with_digits_and_delimiter")
     val patternWithDigitsAndDelimiter: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index e70f3360998..7608a258ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -26,9 +26,9 @@ data class HasOnlyReadOnly (
     @SerializedName("foo")
     val foo: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 5ea4977b7cb..9e5a085a2c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -23,9 +23,9 @@ data class HealthCheckResult (
     @SerializedName("NullableMessage")
     val nullableMessage: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index e513221c62b..d75c0ded436 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -28,9 +28,9 @@ data class InlineObject (
     @SerializedName("status")
     val status: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 183929c471f..1f26364b834 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -28,9 +28,9 @@ data class InlineObject1 (
     @SerializedName("file")
     val file: java.io.File? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 29c4d228fd8..57634dd3f5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -28,9 +28,9 @@ data class InlineObject2 (
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Form parameter enum test (string array)
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index a5734ebed46..f70af3efc5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -76,9 +76,9 @@ data class InlineObject3 (
     @SerializedName("callback")
     val callback: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 488f57faff3..5c38c52ba8d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -28,9 +28,9 @@ data class InlineObject4 (
     @SerializedName("param2")
     val param2: kotlin.String
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 1bd7d0c64b8..6389765702b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -28,9 +28,9 @@ data class InlineObject5 (
     @SerializedName("additionalMetadata")
     val additionalMetadata: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index 0252304ee84..e1d3c615222 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -24,9 +24,9 @@ data class InlineResponseDefault (
     @SerializedName("string")
     val string: Foo? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
index b7c9f9b029b..1aa7715f047 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -23,9 +23,9 @@ data class List (
     @SerializedName("123-list")
     val `123minusList`: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 768f0a76603..9c0bef747fb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -32,9 +32,9 @@ data class MapTest (
     @SerializedName("indirect_map")
     val indirectMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index ec5c3ba8ead..f1dda9dc0ef 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -30,9 +30,9 @@ data class MixedPropertiesAndAdditionalPropertiesClass (
     @SerializedName("map")
     val map: kotlin.collections.Map<kotlin.String, Animal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index b9506ce766f..1bdb62d1b23 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -26,9 +26,9 @@ data class Model200Response (
     @SerializedName("class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
index a26df5946ca..2e30b6b7cd9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -32,9 +32,9 @@ data class Name (
     @SerializedName("123Number")
     val `123number`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 44ef32f2637..534bb572e4f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -56,9 +56,9 @@ data class NullableClass (
     @SerializedName("object_items_nullable")
     val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null
 ) : kotlin.collections.HashMap<String, kotlin.Any>(), Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index ca273d1f3a1..c7138f597e1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -23,9 +23,9 @@ data class NumberOnly (
     @SerializedName("JustNumber")
     val justNumber: java.math.BigDecimal? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
index e691b5ca8fb..2a58f2be7c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 8246390507e..6303e05739b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -29,9 +29,9 @@ data class OuterComposite (
     @SerializedName("my_boolean")
     val myBoolean: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
index 1c2c521eaf5..8d51cd4108b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
@@ -35,11 +35,11 @@ enum class OuterEnum(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
index 12c2b0a94aa..980d368d032 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumDefaultValue(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
index c2ac6a4a936..d5587936a8e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
@@ -35,11 +35,11 @@ enum class OuterEnumInteger(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
index 3066cfbae73..25a816fc4a8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumIntegerDefaultValue(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 6e0b0b873d1..5865f9d672c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @SerializedName("status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 5dff54dc190..81c3bab8745 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -26,9 +26,9 @@ data class ReadOnlyFirst (
     @SerializedName("baz")
     val baz: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
index ecdce7f408f..166cb5aa391 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -23,9 +23,9 @@ data class Return (
     @SerializedName("return")
     val `return`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index f67aa3c948b..c9585969b25 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -23,9 +23,9 @@ data class SpecialModelname (
     @SerializedName("\$special[property.name]")
     val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 04ca1914328..e11be325ef3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @SerializedName("name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
index 24b8c5d47ac..433872af1e9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
new file mode 100644
index 00000000000..63cd1381e9d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/FILES
@@ -0,0 +1,122 @@
+.openapi-generator-ignore
+README.md
+build.gradle
+docs/200Response.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+settings.gradle
+src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
+src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
+src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Animal.kt
+src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+src/main/kotlin/org/openapitools/client/models/Cat.kt
+src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+src/main/kotlin/org/openapitools/client/models/Category.kt
+src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+src/main/kotlin/org/openapitools/client/models/Client.kt
+src/main/kotlin/org/openapitools/client/models/Dog.kt
+src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+src/main/kotlin/org/openapitools/client/models/Foo.kt
+src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+src/main/kotlin/org/openapitools/client/models/List.kt
+src/main/kotlin/org/openapitools/client/models/MapTest.kt
+src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+src/main/kotlin/org/openapitools/client/models/Name.kt
+src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/Order.kt
+src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/Pet.kt
+src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+src/main/kotlin/org/openapitools/client/models/Return.kt
+src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+src/main/kotlin/org/openapitools/client/models/Tag.kt
+src/main/kotlin/org/openapitools/client/models/User.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/VERSION b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/VERSION
index b5d898602c2..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
index fb663183f92..0a28947aa84 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/docs/FakeApi.md
@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 6d216739f0b..04e474059f2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -26,9 +26,9 @@ data class AdditionalPropertiesClass (
     @SerializedName("map_of_map_property")
     val mapOfMapProperty: kotlin.collections.Map<kotlin.String, kotlin.collections.Map<kotlin.String, kotlin.String>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 86992f00d6a..59234b2684f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -21,9 +21,9 @@ import java.io.Serializable
  */
 
 interface Animal : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     @get:SerializedName("className")
     val className: kotlin.String
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 15ea8f6ce57..4d49a464621 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @SerializedName("message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 02723cb9dcd..0c88337e9c1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
     val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index afde31b7ff4..4da5b8e6d5f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
     val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index d9946e24ba4..855cd60a327 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -30,9 +30,9 @@ data class ArrayTest (
     @SerializedName("array_array_of_model")
     val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index a7c7d3c9a76..24e13278871 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -39,9 +39,9 @@ data class Capitalization (
     @SerializedName("ATT_NAME")
     val ATT_NAME: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 3c0b6063ce1..7470f250432 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -31,9 +31,9 @@ data class Cat (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 7b42c1e2f51..17d5df7c0db 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -23,9 +23,9 @@ data class CatAllOf (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
index eddd17dc023..6bfa3b0d01f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @SerializedName("id")
     val id: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index d4ca6d61241..174d49148f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -23,9 +23,9 @@ data class ClassModel (
     @SerializedName("_class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
index 2823f40b88b..31fa6e51bf7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -23,9 +23,9 @@ data class Client (
     @SerializedName("client")
     val client: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
index fbc06cf1dd6..7965fadd703 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -31,9 +31,9 @@ data class Dog (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index c422756a65f..d67d72c0967 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -23,9 +23,9 @@ data class DogAllOf (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index 8ffe63f244b..d4ffb01a388 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -26,9 +26,9 @@ data class EnumArrays (
     @SerializedName("array_enum")
     val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
index 2eccf5d72fa..f5edeb3710f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
@@ -35,11 +35,11 @@ enum class EnumClass(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index a939ed3f41a..507fbaa3c05 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -48,9 +48,9 @@ data class EnumTest (
     @SerializedName("outerEnumIntegerDefaultValue")
     val outerEnumIntegerDefaultValue: OuterEnumIntegerDefaultValue? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 8ccd536e097..1511af5d49b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -26,9 +26,9 @@ data class FileSchemaTestClass (
     @SerializedName("files")
     val files: kotlin.Array<java.io.File>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
index eac43b98525..1ca746f908c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -23,9 +23,9 @@ data class Foo (
     @SerializedName("bar")
     val bar: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index f8f4fd03128..5b9be0b89c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -67,9 +67,9 @@ data class FormatTest (
     @SerializedName("pattern_with_digits_and_delimiter")
     val patternWithDigitsAndDelimiter: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index e70f3360998..7608a258ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -26,9 +26,9 @@ data class HasOnlyReadOnly (
     @SerializedName("foo")
     val foo: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 5ea4977b7cb..9e5a085a2c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -23,9 +23,9 @@ data class HealthCheckResult (
     @SerializedName("NullableMessage")
     val nullableMessage: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index e513221c62b..d75c0ded436 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -28,9 +28,9 @@ data class InlineObject (
     @SerializedName("status")
     val status: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 183929c471f..1f26364b834 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -28,9 +28,9 @@ data class InlineObject1 (
     @SerializedName("file")
     val file: java.io.File? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 29c4d228fd8..57634dd3f5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -28,9 +28,9 @@ data class InlineObject2 (
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Form parameter enum test (string array)
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index a5734ebed46..f70af3efc5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -76,9 +76,9 @@ data class InlineObject3 (
     @SerializedName("callback")
     val callback: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 488f57faff3..5c38c52ba8d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -28,9 +28,9 @@ data class InlineObject4 (
     @SerializedName("param2")
     val param2: kotlin.String
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 1bd7d0c64b8..6389765702b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -28,9 +28,9 @@ data class InlineObject5 (
     @SerializedName("additionalMetadata")
     val additionalMetadata: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index 0252304ee84..e1d3c615222 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -24,9 +24,9 @@ data class InlineResponseDefault (
     @SerializedName("string")
     val string: Foo? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
index b7c9f9b029b..1aa7715f047 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -23,9 +23,9 @@ data class List (
     @SerializedName("123-list")
     val `123minusList`: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 768f0a76603..9c0bef747fb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -32,9 +32,9 @@ data class MapTest (
     @SerializedName("indirect_map")
     val indirectMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index ec5c3ba8ead..f1dda9dc0ef 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -30,9 +30,9 @@ data class MixedPropertiesAndAdditionalPropertiesClass (
     @SerializedName("map")
     val map: kotlin.collections.Map<kotlin.String, Animal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index b9506ce766f..1bdb62d1b23 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -26,9 +26,9 @@ data class Model200Response (
     @SerializedName("class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
index a26df5946ca..2e30b6b7cd9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -32,9 +32,9 @@ data class Name (
     @SerializedName("123Number")
     val `123number`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 44ef32f2637..534bb572e4f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -56,9 +56,9 @@ data class NullableClass (
     @SerializedName("object_items_nullable")
     val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null
 ) : kotlin.collections.HashMap<String, kotlin.Any>(), Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index ca273d1f3a1..c7138f597e1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -23,9 +23,9 @@ data class NumberOnly (
     @SerializedName("JustNumber")
     val justNumber: java.math.BigDecimal? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
index e691b5ca8fb..2a58f2be7c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 8246390507e..6303e05739b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -29,9 +29,9 @@ data class OuterComposite (
     @SerializedName("my_boolean")
     val myBoolean: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
index 1c2c521eaf5..8d51cd4108b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
@@ -35,11 +35,11 @@ enum class OuterEnum(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
index 12c2b0a94aa..980d368d032 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumDefaultValue(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
index c2ac6a4a936..d5587936a8e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
@@ -35,11 +35,11 @@ enum class OuterEnumInteger(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
index 3066cfbae73..25a816fc4a8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumIntegerDefaultValue(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 6e0b0b873d1..5865f9d672c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @SerializedName("status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 5dff54dc190..81c3bab8745 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -26,9 +26,9 @@ data class ReadOnlyFirst (
     @SerializedName("baz")
     val baz: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
index ecdce7f408f..166cb5aa391 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -23,9 +23,9 @@ data class Return (
     @SerializedName("return")
     val `return`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index f67aa3c948b..c9585969b25 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -23,9 +23,9 @@ data class SpecialModelname (
     @SerializedName("\$special[property.name]")
     val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 04ca1914328..e11be325ef3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @SerializedName("name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
index 24b8c5d47ac..433872af1e9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
new file mode 100644
index 00000000000..63cd1381e9d
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/FILES
@@ -0,0 +1,122 @@
+.openapi-generator-ignore
+README.md
+build.gradle
+docs/200Response.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+settings.gradle
+src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/CollectionFormats.kt
+src/main/kotlin/org/openapitools/client/infrastructure/DateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
+src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Animal.kt
+src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+src/main/kotlin/org/openapitools/client/models/Cat.kt
+src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+src/main/kotlin/org/openapitools/client/models/Category.kt
+src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+src/main/kotlin/org/openapitools/client/models/Client.kt
+src/main/kotlin/org/openapitools/client/models/Dog.kt
+src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+src/main/kotlin/org/openapitools/client/models/Foo.kt
+src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+src/main/kotlin/org/openapitools/client/models/List.kt
+src/main/kotlin/org/openapitools/client/models/MapTest.kt
+src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+src/main/kotlin/org/openapitools/client/models/Name.kt
+src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/Order.kt
+src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/Pet.kt
+src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+src/main/kotlin/org/openapitools/client/models/Return.kt
+src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+src/main/kotlin/org/openapitools/client/models/Tag.kt
+src/main/kotlin/org/openapitools/client/models/User.kt
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/VERSION b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/VERSION
index b5d898602c2..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
index fb663183f92..0a28947aa84 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/docs/FakeApi.md
@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 6d216739f0b..04e474059f2 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -26,9 +26,9 @@ data class AdditionalPropertiesClass (
     @SerializedName("map_of_map_property")
     val mapOfMapProperty: kotlin.collections.Map<kotlin.String, kotlin.collections.Map<kotlin.String, kotlin.String>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 86992f00d6a..59234b2684f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -21,9 +21,9 @@ import java.io.Serializable
  */
 
 interface Animal : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     @get:SerializedName("className")
     val className: kotlin.String
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 15ea8f6ce57..4d49a464621 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @SerializedName("message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 02723cb9dcd..0c88337e9c1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfArrayOfNumberOnly (
     @SerializedName("ArrayArrayNumber")
     val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index afde31b7ff4..4da5b8e6d5f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfNumberOnly (
     @SerializedName("ArrayNumber")
     val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index d9946e24ba4..855cd60a327 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -30,9 +30,9 @@ data class ArrayTest (
     @SerializedName("array_array_of_model")
     val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index a7c7d3c9a76..24e13278871 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -39,9 +39,9 @@ data class Capitalization (
     @SerializedName("ATT_NAME")
     val ATT_NAME: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 3c0b6063ce1..7470f250432 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -31,9 +31,9 @@ data class Cat (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index 7b42c1e2f51..17d5df7c0db 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -23,9 +23,9 @@ data class CatAllOf (
     @SerializedName("declawed")
     val declawed: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
index eddd17dc023..6bfa3b0d01f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @SerializedName("id")
     val id: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index d4ca6d61241..174d49148f0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -23,9 +23,9 @@ data class ClassModel (
     @SerializedName("_class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
index 2823f40b88b..31fa6e51bf7 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -23,9 +23,9 @@ data class Client (
     @SerializedName("client")
     val client: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
index fbc06cf1dd6..7965fadd703 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -31,9 +31,9 @@ data class Dog (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index c422756a65f..d67d72c0967 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -23,9 +23,9 @@ data class DogAllOf (
     @SerializedName("breed")
     val breed: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index 8ffe63f244b..d4ffb01a388 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -26,9 +26,9 @@ data class EnumArrays (
     @SerializedName("array_enum")
     val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
index 2eccf5d72fa..f5edeb3710f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
@@ -35,11 +35,11 @@ enum class EnumClass(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index a939ed3f41a..507fbaa3c05 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -48,9 +48,9 @@ data class EnumTest (
     @SerializedName("outerEnumIntegerDefaultValue")
     val outerEnumIntegerDefaultValue: OuterEnumIntegerDefaultValue? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 8ccd536e097..1511af5d49b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -26,9 +26,9 @@ data class FileSchemaTestClass (
     @SerializedName("files")
     val files: kotlin.Array<java.io.File>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
index eac43b98525..1ca746f908c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -23,9 +23,9 @@ data class Foo (
     @SerializedName("bar")
     val bar: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index f8f4fd03128..5b9be0b89c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -67,9 +67,9 @@ data class FormatTest (
     @SerializedName("pattern_with_digits_and_delimiter")
     val patternWithDigitsAndDelimiter: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index e70f3360998..7608a258ae5 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -26,9 +26,9 @@ data class HasOnlyReadOnly (
     @SerializedName("foo")
     val foo: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index 5ea4977b7cb..9e5a085a2c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -23,9 +23,9 @@ data class HealthCheckResult (
     @SerializedName("NullableMessage")
     val nullableMessage: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index e513221c62b..d75c0ded436 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -28,9 +28,9 @@ data class InlineObject (
     @SerializedName("status")
     val status: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 183929c471f..1f26364b834 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -28,9 +28,9 @@ data class InlineObject1 (
     @SerializedName("file")
     val file: java.io.File? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 29c4d228fd8..57634dd3f5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -28,9 +28,9 @@ data class InlineObject2 (
     @SerializedName("enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Form parameter enum test (string array)
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index a5734ebed46..f70af3efc5a 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -76,9 +76,9 @@ data class InlineObject3 (
     @SerializedName("callback")
     val callback: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index 488f57faff3..5c38c52ba8d 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -28,9 +28,9 @@ data class InlineObject4 (
     @SerializedName("param2")
     val param2: kotlin.String
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 1bd7d0c64b8..6389765702b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -28,9 +28,9 @@ data class InlineObject5 (
     @SerializedName("additionalMetadata")
     val additionalMetadata: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index 0252304ee84..e1d3c615222 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -24,9 +24,9 @@ data class InlineResponseDefault (
     @SerializedName("string")
     val string: Foo? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
index b7c9f9b029b..1aa7715f047 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -23,9 +23,9 @@ data class List (
     @SerializedName("123-list")
     val `123minusList`: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index 768f0a76603..9c0bef747fb 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -32,9 +32,9 @@ data class MapTest (
     @SerializedName("indirect_map")
     val indirectMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index ec5c3ba8ead..f1dda9dc0ef 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -30,9 +30,9 @@ data class MixedPropertiesAndAdditionalPropertiesClass (
     @SerializedName("map")
     val map: kotlin.collections.Map<kotlin.String, Animal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index b9506ce766f..1bdb62d1b23 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -26,9 +26,9 @@ data class Model200Response (
     @SerializedName("class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
index a26df5946ca..2e30b6b7cd9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -32,9 +32,9 @@ data class Name (
     @SerializedName("123Number")
     val `123number`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index 44ef32f2637..534bb572e4f 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -56,9 +56,9 @@ data class NullableClass (
     @SerializedName("object_items_nullable")
     val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null
 ) : kotlin.collections.HashMap<String, kotlin.Any>(), Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index ca273d1f3a1..c7138f597e1 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -23,9 +23,9 @@ data class NumberOnly (
     @SerializedName("JustNumber")
     val justNumber: java.math.BigDecimal? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
index e691b5ca8fb..2a58f2be7c0 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index 8246390507e..6303e05739b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -29,9 +29,9 @@ data class OuterComposite (
     @SerializedName("my_boolean")
     val myBoolean: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
index 1c2c521eaf5..8d51cd4108b 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
@@ -35,11 +35,11 @@ enum class OuterEnum(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
index 12c2b0a94aa..980d368d032 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumDefaultValue(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
index c2ac6a4a936..d5587936a8e 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
@@ -35,11 +35,11 @@ enum class OuterEnumInteger(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
index 3066cfbae73..25a816fc4a8 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumIntegerDefaultValue(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 6e0b0b873d1..5865f9d672c 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @SerializedName("status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index 5dff54dc190..81c3bab8745 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -26,9 +26,9 @@ data class ReadOnlyFirst (
     @SerializedName("baz")
     val baz: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
index ecdce7f408f..166cb5aa391 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -23,9 +23,9 @@ data class Return (
     @SerializedName("return")
     val `return`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index f67aa3c948b..c9585969b25 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -23,9 +23,9 @@ data class SpecialModelname (
     @SerializedName("\$special[property.name]")
     val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 04ca1914328..e11be325ef3 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @SerializedName("name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
index 24b8c5d47ac..433872af1e9 100644
--- a/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin-jvm-retrofit2-rx2/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
new file mode 100644
index 00000000000..542bb6338ff
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/FILES
@@ -0,0 +1,135 @@
+.openapi-generator-ignore
+README.md
+build.gradle
+docs/200Response.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+gradle/wrapper/gradle-wrapper.jar
+gradle/wrapper/gradle-wrapper.properties
+gradlew
+gradlew.bat
+settings.gradle
+src/commonMain/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+src/commonMain/kotlin/org/openapitools/client/apis/DefaultApi.kt
+src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
+src/commonMain/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+src/commonMain/kotlin/org/openapitools/client/auth/ApiKeyAuth.kt
+src/commonMain/kotlin/org/openapitools/client/auth/Authentication.kt
+src/commonMain/kotlin/org/openapitools/client/auth/HttpBasicAuth.kt
+src/commonMain/kotlin/org/openapitools/client/auth/HttpBearerAuth.kt
+src/commonMain/kotlin/org/openapitools/client/auth/OAuth.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/Base64ByteArray.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/Bytes.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/HttpResponse.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/OctetByteArray.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
+src/commonMain/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
+src/commonMain/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+src/commonMain/kotlin/org/openapitools/client/models/Animal.kt
+src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+src/commonMain/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+src/commonMain/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+src/commonMain/kotlin/org/openapitools/client/models/ArrayTest.kt
+src/commonMain/kotlin/org/openapitools/client/models/Capitalization.kt
+src/commonMain/kotlin/org/openapitools/client/models/Cat.kt
+src/commonMain/kotlin/org/openapitools/client/models/CatAllOf.kt
+src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+src/commonMain/kotlin/org/openapitools/client/models/ClassModel.kt
+src/commonMain/kotlin/org/openapitools/client/models/Client.kt
+src/commonMain/kotlin/org/openapitools/client/models/Dog.kt
+src/commonMain/kotlin/org/openapitools/client/models/DogAllOf.kt
+src/commonMain/kotlin/org/openapitools/client/models/EnumArrays.kt
+src/commonMain/kotlin/org/openapitools/client/models/EnumClass.kt
+src/commonMain/kotlin/org/openapitools/client/models/EnumTest.kt
+src/commonMain/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+src/commonMain/kotlin/org/openapitools/client/models/Foo.kt
+src/commonMain/kotlin/org/openapitools/client/models/FormatTest.kt
+src/commonMain/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+src/commonMain/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject1.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject2.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject3.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject4.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineObject5.kt
+src/commonMain/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+src/commonMain/kotlin/org/openapitools/client/models/List.kt
+src/commonMain/kotlin/org/openapitools/client/models/MapTest.kt
+src/commonMain/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+src/commonMain/kotlin/org/openapitools/client/models/Model200Response.kt
+src/commonMain/kotlin/org/openapitools/client/models/Name.kt
+src/commonMain/kotlin/org/openapitools/client/models/NullableClass.kt
+src/commonMain/kotlin/org/openapitools/client/models/NumberOnly.kt
+src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+src/commonMain/kotlin/org/openapitools/client/models/OuterComposite.kt
+src/commonMain/kotlin/org/openapitools/client/models/OuterEnum.kt
+src/commonMain/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+src/commonMain/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+src/commonMain/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+src/commonMain/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+src/commonMain/kotlin/org/openapitools/client/models/Return.kt
+src/commonMain/kotlin/org/openapitools/client/models/SpecialModelname.kt
+src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+src/commonMain/kotlin/org/openapitools/client/models/User.kt
+src/commonTest/kotlin/util/Coroutine.kt
+src/iosTest/kotlin/util/Coroutine.kt
+src/jsTest/kotlin/util/Coroutine.kt
+src/jvmTest/kotlin/util/Coroutine.kt
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
index b5d898602c2..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
index dcb60194b74..2e4b0f90ffa 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/docs/FakeApi.md
@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar b/samples/openapi3/client/petstore/kotlin-multiplatform/gradle/wrapper/gradle-wrapper.jar
index 2c6137b87896c8f70315ae454e00a969ef5f6019..886ca115d4afe587ae2edae15bf4da766d64669b 100644
GIT binary patch
literal 91141
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
RHO^xOeT`V2o)@vX{~tI}ju!v`

literal 53639
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
F{{tUq7iIte

diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
index 06e0a8ba2d8..0232be74fe1 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -405,13 +405,13 @@ class FakeApi @UseExperimental(UnstableDefault::class) constructor(
     * To test enum parameters
     * To test enum parameters
     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-    * @param enumHeaderString Header parameter enum test (string) (optional, default to '-efg')
+    * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
-    * @param enumQueryString Query parameter enum test (string) (optional, default to '-efg')
+    * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
     * @param enumQueryInteger Query parameter enum test (double) (optional)
     * @param enumQueryDouble Query parameter enum test (double) (optional)
-    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to '$')
-    * @param enumFormString Form parameter enum test (string) (optional, default to '-efg')
+    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+    * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
     * @return void
     */
     suspend fun testEnumParameters(enumHeaderStringArray: kotlin.Array<kotlin.String>?, enumHeaderString: kotlin.String?, enumQueryStringArray: kotlin.Array<kotlin.String>?, enumQueryString: kotlin.String?, enumQueryInteger: kotlin.Int?, enumQueryDouble: kotlin.Double?, enumFormStringArray: kotlin.Array<kotlin.String>?, enumFormString: kotlin.String?) : HttpResponse<Unit> {
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumClass.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumClass.kt
index 56dd3610741..b75078db4ab 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumClass.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/EnumClass.kt
@@ -33,11 +33,11 @@ enum class EnumClass(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnum.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnum.kt
index 4d727954666..c07437b2387 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnum.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnum.kt
@@ -33,11 +33,11 @@ enum class OuterEnum(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
index d818ad3a459..cacf26925d5 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
@@ -33,11 +33,11 @@ enum class OuterEnumDefaultValue(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumInteger.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
index 19973003776..a37705dc6e7 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
@@ -33,11 +33,11 @@ enum class OuterEnumInteger(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
index a46a90efb07..8667ea543c3 100644
--- a/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
@@ -33,11 +33,11 @@ enum class OuterEnumIntegerDefaultValue(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin/.openapi-generator/FILES b/samples/openapi3/client/petstore/kotlin/.openapi-generator/FILES
new file mode 100644
index 00000000000..535d2438cfd
--- /dev/null
+++ b/samples/openapi3/client/petstore/kotlin/.openapi-generator/FILES
@@ -0,0 +1,128 @@
+.openapi-generator-ignore
+README.md
+build.gradle
+docs/200Response.md
+docs/AdditionalPropertiesClass.md
+docs/Animal.md
+docs/AnotherFakeApi.md
+docs/ApiResponse.md
+docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfNumberOnly.md
+docs/ArrayTest.md
+docs/Capitalization.md
+docs/Cat.md
+docs/CatAllOf.md
+docs/Category.md
+docs/ClassModel.md
+docs/Client.md
+docs/DefaultApi.md
+docs/Dog.md
+docs/DogAllOf.md
+docs/EnumArrays.md
+docs/EnumClass.md
+docs/EnumTest.md
+docs/FakeApi.md
+docs/FakeClassnameTags123Api.md
+docs/FileSchemaTestClass.md
+docs/Foo.md
+docs/FormatTest.md
+docs/HasOnlyReadOnly.md
+docs/HealthCheckResult.md
+docs/InlineObject.md
+docs/InlineObject1.md
+docs/InlineObject2.md
+docs/InlineObject3.md
+docs/InlineObject4.md
+docs/InlineObject5.md
+docs/InlineResponseDefault.md
+docs/List.md
+docs/MapTest.md
+docs/MixedPropertiesAndAdditionalPropertiesClass.md
+docs/Name.md
+docs/NullableClass.md
+docs/NumberOnly.md
+docs/Order.md
+docs/OuterComposite.md
+docs/OuterEnum.md
+docs/OuterEnumDefaultValue.md
+docs/OuterEnumInteger.md
+docs/OuterEnumIntegerDefaultValue.md
+docs/Pet.md
+docs/PetApi.md
+docs/ReadOnlyFirst.md
+docs/Return.md
+docs/SpecialModelName.md
+docs/StoreApi.md
+docs/Tag.md
+docs/User.md
+docs/UserApi.md
+settings.gradle
+src/main/kotlin/org/openapitools/client/apis/AnotherFakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/DefaultApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+src/main/kotlin/org/openapitools/client/apis/FakeClassnameTags123Api.kt
+src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiAbstractions.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiClient.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApiInfrastructureResponse.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ApplicationDelegates.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ByteArrayAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Errors.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/LocalDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/OffsetDateTimeAdapter.kt
+src/main/kotlin/org/openapitools/client/infrastructure/RequestConfig.kt
+src/main/kotlin/org/openapitools/client/infrastructure/RequestMethod.kt
+src/main/kotlin/org/openapitools/client/infrastructure/ResponseExtensions.kt
+src/main/kotlin/org/openapitools/client/infrastructure/Serializer.kt
+src/main/kotlin/org/openapitools/client/infrastructure/UUIDAdapter.kt
+src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Animal.kt
+src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+src/main/kotlin/org/openapitools/client/models/Cat.kt
+src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+src/main/kotlin/org/openapitools/client/models/Category.kt
+src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+src/main/kotlin/org/openapitools/client/models/Client.kt
+src/main/kotlin/org/openapitools/client/models/Dog.kt
+src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+src/main/kotlin/org/openapitools/client/models/Foo.kt
+src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+src/main/kotlin/org/openapitools/client/models/List.kt
+src/main/kotlin/org/openapitools/client/models/MapTest.kt
+src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+src/main/kotlin/org/openapitools/client/models/Name.kt
+src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+src/main/kotlin/org/openapitools/client/models/Order.kt
+src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+src/main/kotlin/org/openapitools/client/models/Pet.kt
+src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+src/main/kotlin/org/openapitools/client/models/Return.kt
+src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+src/main/kotlin/org/openapitools/client/models/Tag.kt
+src/main/kotlin/org/openapitools/client/models/User.kt
diff --git a/samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION b/samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION
index b5d898602c2..d99e7162d01 100644
--- a/samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION
+++ b/samples/openapi3/client/petstore/kotlin/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.1-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md b/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
index fb663183f92..0a28947aa84 100644
--- a/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/kotlin/docs/FakeApi.md
@@ -551,13 +551,13 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **enumHeaderStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
- **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumHeaderString** | **kotlin.String**| Header parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
- **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumQueryString** | **kotlin.String**| Query parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
  **enumQueryInteger** | **kotlin.Int**| Query parameter enum test (double) | [optional] [enum: 1, -2]
  **enumQueryDouble** | **kotlin.Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
- **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &#39;$&#39;] [enum: >, $]
- **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &#39;-efg&#39;] [enum: _abc, -efg, (xyz)]
+ **enumFormStringArray** | [**kotlin.Array&lt;kotlin.String&gt;**](kotlin.String.md)| Form parameter enum test (string array) | [optional] [default to &quot;$&quot;] [enum: >, $]
+ **enumFormString** | **kotlin.String**| Form parameter enum test (string) | [optional] [default to &quot;-efg&quot;] [enum: _abc, -efg, (xyz)]
 
 ### Return type
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
index 740608cb024..e2847ef4c5f 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/FakeApi.kt
@@ -471,13 +471,13 @@ class FakeApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     * To test enum parameters
     * To test enum parameters
     * @param enumHeaderStringArray Header parameter enum test (string array) (optional)
-    * @param enumHeaderString Header parameter enum test (string) (optional, default to '-efg')
+    * @param enumHeaderString Header parameter enum test (string) (optional, default to "-efg")
     * @param enumQueryStringArray Query parameter enum test (string array) (optional)
-    * @param enumQueryString Query parameter enum test (string) (optional, default to '-efg')
+    * @param enumQueryString Query parameter enum test (string) (optional, default to "-efg")
     * @param enumQueryInteger Query parameter enum test (double) (optional)
     * @param enumQueryDouble Query parameter enum test (double) (optional)
-    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to '$')
-    * @param enumFormString Form parameter enum test (string) (optional, default to '-efg')
+    * @param enumFormStringArray Form parameter enum test (string array) (optional, default to "$")
+    * @param enumFormString Form parameter enum test (string) (optional, default to "-efg")
     * @return void
     * @throws UnsupportedOperationException If the API returns an informational or redirection response
     * @throws ClientException If the API returns a client error response
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index b5d5deca904..67d7955bb93 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -170,6 +170,7 @@ class PetApi(basePath: kotlin.String = defaultBasePath) : ApiClient(basePath) {
     */
     @Suppress("UNCHECKED_CAST")
     @Throws(UnsupportedOperationException::class, ClientException::class, ServerException::class)
+    @Deprecated(message = "This operation is deprecated.")
     fun findPetsByTags(tags: kotlin.Array<kotlin.String>) : kotlin.Array<Pet> {
         val localVariableBody: kotlin.Any? = null
         val localVariableQuery: MultiValueMap = mutableMapOf<kotlin.String, List<kotlin.String>>()
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
index 1c349000634..42e82f66807 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/AdditionalPropertiesClass.kt
@@ -26,9 +26,9 @@ data class AdditionalPropertiesClass (
     @Json(name = "map_of_map_property")
     val mapOfMapProperty: kotlin.collections.Map<kotlin.String, kotlin.collections.Map<kotlin.String, kotlin.String>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
index 6e1d0820cc9..71c88c15c35 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Animal.kt
@@ -21,9 +21,9 @@ import java.io.Serializable
  */
 
 interface Animal : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     @Json(name = "className")
     val className: kotlin.String
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 0a13c7737ed..d6922e4d96c 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -29,9 +29,9 @@ data class ApiResponse (
     @Json(name = "message")
     val message: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
index 05ea7ceb7c8..0b15c44c4ce 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfArrayOfNumberOnly (
     @Json(name = "ArrayArrayNumber")
     val arrayArrayNumber: kotlin.Array<kotlin.Array<java.math.BigDecimal>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
index 50a185a83e7..64257ddc92c 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayOfNumberOnly.kt
@@ -23,9 +23,9 @@ data class ArrayOfNumberOnly (
     @Json(name = "ArrayNumber")
     val arrayNumber: kotlin.Array<java.math.BigDecimal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
index 9a980272720..22441aba388 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ArrayTest.kt
@@ -30,9 +30,9 @@ data class ArrayTest (
     @Json(name = "array_array_of_model")
     val arrayArrayOfModel: kotlin.Array<kotlin.Array<ReadOnlyFirst>>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
index fb29c174858..2e321905c3f 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Capitalization.kt
@@ -39,9 +39,9 @@ data class Capitalization (
     @Json(name = "ATT_NAME")
     val ATT_NAME: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
index 4fcd2af6a6f..0d3fc6381c9 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Cat.kt
@@ -31,9 +31,9 @@ data class Cat (
     @Json(name = "declawed")
     val declawed: kotlin.Boolean? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
index a40140de841..7fec650f4bb 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/CatAllOf.kt
@@ -23,9 +23,9 @@ data class CatAllOf (
     @Json(name = "declawed")
     val declawed: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index fe0d03dce81..055ac892492 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -26,9 +26,9 @@ data class Category (
     @Json(name = "id")
     val id: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
index fe0639b7fb1..919da5f0f48 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ClassModel.kt
@@ -23,9 +23,9 @@ data class ClassModel (
     @Json(name = "_class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
index 201d4bbbd72..b766f9ba9f2 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Client.kt
@@ -23,9 +23,9 @@ data class Client (
     @Json(name = "client")
     val client: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
index 5ffd15879f8..2e842529c4f 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Dog.kt
@@ -31,9 +31,9 @@ data class Dog (
     @Json(name = "breed")
     val breed: kotlin.String? = null
 ) : Animal, Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
index 019476d4f63..7f005986327 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/DogAllOf.kt
@@ -23,9 +23,9 @@ data class DogAllOf (
     @Json(name = "breed")
     val breed: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
index 8d9076e627f..f4e145b600b 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumArrays.kt
@@ -26,9 +26,9 @@ data class EnumArrays (
     @Json(name = "array_enum")
     val arrayEnum: kotlin.Array<EnumArrays.ArrayEnum>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
index 8bd3f24f829..c8090bb00c9 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumClass.kt
@@ -35,11 +35,11 @@ enum class EnumClass(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
index f2b499dedfc..346cc493053 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/EnumTest.kt
@@ -48,9 +48,9 @@ data class EnumTest (
     @Json(name = "outerEnumIntegerDefaultValue")
     val outerEnumIntegerDefaultValue: OuterEnumIntegerDefaultValue? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
index 877c970780f..ae3a0c55ac2 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FileSchemaTestClass.kt
@@ -26,9 +26,9 @@ data class FileSchemaTestClass (
     @Json(name = "files")
     val files: kotlin.Array<java.io.File>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
index 34baa08bfa0..d103385d685 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Foo.kt
@@ -23,9 +23,9 @@ data class Foo (
     @Json(name = "bar")
     val bar: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
index 5820c2f7b42..3ef83ab19cb 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/FormatTest.kt
@@ -67,9 +67,9 @@ data class FormatTest (
     @Json(name = "pattern_with_digits_and_delimiter")
     val patternWithDigitsAndDelimiter: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
index e3a09f94c96..807b7c846fb 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HasOnlyReadOnly.kt
@@ -26,9 +26,9 @@ data class HasOnlyReadOnly (
     @Json(name = "foo")
     val foo: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
index ad7cfc23b6a..4dde950bd72 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/HealthCheckResult.kt
@@ -23,9 +23,9 @@ data class HealthCheckResult (
     @Json(name = "NullableMessage")
     val nullableMessage: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
index 70ac28e3d53..33175a232f6 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject.kt
@@ -28,9 +28,9 @@ data class InlineObject (
     @Json(name = "status")
     val status: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
index 72806f05c96..7fd9544b781 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject1.kt
@@ -28,9 +28,9 @@ data class InlineObject1 (
     @Json(name = "file")
     val file: java.io.File? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
index 43f87364d31..d0c9b5b7160 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject2.kt
@@ -28,9 +28,9 @@ data class InlineObject2 (
     @Json(name = "enum_form_string")
     val enumFormString: InlineObject2.EnumFormString? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Form parameter enum test (string array)
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
index 142b9b788d1..62bd57318c5 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject3.kt
@@ -76,9 +76,9 @@ data class InlineObject3 (
     @Json(name = "callback")
     val callback: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
index b380c4ce723..d08e4105f84 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject4.kt
@@ -28,9 +28,9 @@ data class InlineObject4 (
     @Json(name = "param2")
     val param2: kotlin.String
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
index 80b8a1788f2..cd06eb38092 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineObject5.kt
@@ -28,9 +28,9 @@ data class InlineObject5 (
     @Json(name = "additionalMetadata")
     val additionalMetadata: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
index d78338d8a8f..2284790d422 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/InlineResponseDefault.kt
@@ -24,9 +24,9 @@ data class InlineResponseDefault (
     @Json(name = "string")
     val string: Foo? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
index 7840b609039..c93bd427bf2 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/List.kt
@@ -23,9 +23,9 @@ data class List (
     @Json(name = "123-list")
     val `123minusList`: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
index d3eae1e85ab..960045349b3 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MapTest.kt
@@ -32,9 +32,9 @@ data class MapTest (
     @Json(name = "indirect_map")
     val indirectMap: kotlin.collections.Map<kotlin.String, kotlin.Boolean>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
index 44844b5d013..974cc929041 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/MixedPropertiesAndAdditionalPropertiesClass.kt
@@ -30,9 +30,9 @@ data class MixedPropertiesAndAdditionalPropertiesClass (
     @Json(name = "map")
     val map: kotlin.collections.Map<kotlin.String, Animal>? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
index 3c92defc46b..c2773adff52 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Model200Response.kt
@@ -26,9 +26,9 @@ data class Model200Response (
     @Json(name = "class")
     val propertyClass: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
index 544fdcc91aa..916146269e7 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Name.kt
@@ -32,9 +32,9 @@ data class Name (
     @Json(name = "123Number")
     val `123number`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
index e5d9c43d2a5..c425afbd074 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NullableClass.kt
@@ -56,9 +56,9 @@ data class NullableClass (
     @Json(name = "object_items_nullable")
     val objectItemsNullable: kotlin.collections.Map<kotlin.String, kotlin.Any>? = null
 ) : kotlin.collections.HashMap<String, kotlin.Any>(), Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
index 3bc4389e1cc..bc8a0156c60 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/NumberOnly.kt
@@ -23,9 +23,9 @@ data class NumberOnly (
     @Json(name = "JustNumber")
     val justNumber: java.math.BigDecimal? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index a4e0ad8f52d..8d14c5b8d0e 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -39,9 +39,9 @@ data class Order (
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * Order Status
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
index c22ad0b5f8f..74ddae39930 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterComposite.kt
@@ -29,9 +29,9 @@ data class OuterComposite (
     @Json(name = "my_boolean")
     val myBoolean: kotlin.Boolean? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
index 6c5d370c87c..ad7e1434a20 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnum.kt
@@ -35,11 +35,11 @@ enum class OuterEnum(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
index f1c4a862434..939ee4cb95c 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumDefaultValue(val value: kotlin.String){
 
 
 
-	/**
-	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 {
+    /**
+    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/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
index b8f161d126b..447872e5353 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumInteger.kt
@@ -35,11 +35,11 @@ enum class OuterEnumInteger(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
index 97c15f39a2c..a98bd861c5e 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/OuterEnumIntegerDefaultValue.kt
@@ -35,11 +35,11 @@ enum class OuterEnumIntegerDefaultValue(val value: kotlin.Int){
 
 
 
-	/**
-	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 {
+    /**
+    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.toString()
     }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 389a15cf692..ea8bbdc4cb4 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -41,9 +41,9 @@ data class Pet (
     @Json(name = "status")
     val status: Pet.Status? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
     /**
     * pet status in the store
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
index ac09dd089e0..51c3d806dfd 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ReadOnlyFirst.kt
@@ -26,9 +26,9 @@ data class ReadOnlyFirst (
     @Json(name = "baz")
     val baz: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
index 1d2dd5ac1e9..ea215b2e44d 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Return.kt
@@ -23,9 +23,9 @@ data class Return (
     @Json(name = "return")
     val `return`: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
index 731a3b05e83..b5e0c881d3f 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/SpecialModelname.kt
@@ -23,9 +23,9 @@ data class SpecialModelname (
     @Json(name = "\$special[property.name]")
     val dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket: kotlin.Long? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 6d999d38576..2cc3079a745 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -26,9 +26,9 @@ data class Tag (
     @Json(name = "name")
     val name: kotlin.String? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 
diff --git a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index fbe6650a914..63cce33a54e 100644
--- a/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/openapi3/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -45,9 +45,9 @@ data class User (
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
 ) : Serializable {
-	companion object {
-		private const val serialVersionUID: Long = 123
-	}
+    companion object {
+        private const val serialVersionUID: Long = 123
+    }
 
 }
 

From 2be0afffe26fd2b4605742fc63342cfcd3154ce1 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 4 Jun 2020 21:55:10 +0800
Subject: [PATCH 20/22] [Go] whitelist AdditionalProperties in the field name
 (#6543)

* whitelist AdditionalProperties in Go field name

* code format
---
 .../codegen/languages/AbstractGoCodegen.java  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
index 262ecaad0e2..762f75e35d2 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractGoCodegen.java
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.util.*;
 
-import static org.openapitools.codegen.utils.OnceLogger.once;
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 import static org.openapitools.codegen.utils.StringUtils.underscore;
 
@@ -94,7 +93,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
                         "byte",
                         "map[string]interface{}",
                         "interface{}"
-                        )
+                )
         );
 
         instantiationTypes.clear();
@@ -210,6 +209,11 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
         if (name.matches("^\\d.*"))
             name = "Var" + name;
 
+        if ("AdditionalProperties".equals(name)) {
+            // AdditionalProperties is a reserved field (additionalProperties: true), use AdditionalPropertiesField instead
+            return "AdditionalPropertiesField";
+        }
+
         return name;
     }
 
@@ -320,7 +324,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
     /**
      * Return the golang implementation type for the specified property.
-     * 
+     *
      * @param p the OAS property.
      * @return the golang implementation type.
      */
@@ -378,7 +382,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
     /**
      * Return the OpenAPI type for the property.
-     * 
+     *
      * @param p the OAS property.
      * @return the OpenAPI type.
      */
@@ -404,20 +408,19 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
 
     /**
      * Determines the golang instantiation type of the specified schema.
-     *
+     * <p>
      * This function is called when the input schema is a map, and specifically
      * when the 'additionalProperties' attribute is present in the OAS specification.
      * Codegen invokes this function to resolve the "parent" association to
      * 'additionalProperties'.
-     *
+     * <p>
      * Note the 'parent' attribute in the codegen model is used in the following scenarios:
      * - Indicate a polymorphic association with some other type (e.g. class inheritance).
      * - If the specification has a discriminator, cogegen create a “parent” based on the discriminator.
      * - Use of the 'additionalProperties' attribute in the OAS specification.
-     *   This is the specific scenario when codegen invokes this function.
+     * This is the specific scenario when codegen invokes this function.
      *
      * @param property the input schema
-     *
      * @return the golang instantiation type of the specified property.
      */
     @Override

From e708cdc83eb22e6f2087eb9b85139ecba1917626 Mon Sep 17 00:00:00 2001
From: Jiri Kuncar <jiri.kuncar@gmail.com>
Date: Thu, 4 Jun 2020 16:50:53 +0200
Subject: [PATCH 21/22] [BUG][python] Support named arrays (#6493)

* [python] Support named arrays

* Fix named array type

* Use ModelSimple

* Reset samples

* Regenerated

* Animal farm test

* Array of enums

* Clean-up

* Clean-up

* Clean-up

* Fix array type generation

* simplify

* array model is not alias

* Array model has one value field

* ensure up-to-date

* ./bin/utils/ensure-up-to-date --batch

* Solve issue with missing import for array model

* regenerate
---
 .../PythonClientExperimentalCodegen.java      |  11 +-
 .../python/python-experimental/model.mustache |   5 +
 .../python/PythonClientExperimentalTest.java  |   2 +-
 ...odels-for-testing-with-http-signature.yaml |  17 ++
 .../.openapi-generator/FILES                  |   2 +
 .../petstore/python-experimental/README.md    |   1 +
 .../python-experimental/docs/AnimalFarm.md    |  10 +
 .../petstore_api/model/animal_farm.py         | 173 ++++++++++++++++++
 .../petstore_api/models/__init__.py           |   1 +
 .../test/test_animal_farm.py                  |  43 +++++
 .../.openapi-generator/FILES                  |   4 +
 .../petstore/python-experimental/README.md    |   3 +
 .../python-experimental/docs/AnimalFarm.md    |  10 +
 .../python-experimental/docs/ArrayOfEnums.md  |  10 +
 .../python-experimental/docs/FakeApi.md       |  59 ++++++
 .../petstore_api/api/fake_api.py              | 104 +++++++++++
 .../petstore_api/model/animal_farm.py         | 173 ++++++++++++++++++
 .../petstore_api/model/array_of_enums.py      | 173 ++++++++++++++++++
 .../petstore_api/models/__init__.py           |   2 +
 .../test/test_animal_farm.py                  |  43 +++++
 .../test/test_array_of_enums.py               |  43 +++++
 .../tests/test_api_validation.py              |  10 +
 22 files changed, 891 insertions(+), 8 deletions(-)
 create mode 100644 samples/client/petstore/python-experimental/docs/AnimalFarm.md
 create mode 100644 samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
 create mode 100644 samples/client/petstore/python-experimental/test/test_animal_farm.py
 create mode 100644 samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md
 create mode 100644 samples/openapi3/client/petstore/python-experimental/docs/ArrayOfEnums.md
 create mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
 create mode 100644 samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
 create mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_animal_farm.py
 create mode 100644 samples/openapi3/client/petstore/python-experimental/test/test_array_of_enums.py

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
index 6096b444ca3..e5adf04afdf 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientExperimentalCodegen.java
@@ -421,14 +421,12 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
 
                 Schema modelSchema = ModelUtils.getSchema(this.openAPI, cm.name);
                 CodegenProperty modelProperty = fromProperty("value", modelSchema);
+
                 if (cm.isEnum || cm.isAlias) {
-                    if (!modelProperty.isEnum && !modelProperty.hasValidation) {
+                    if (!modelProperty.isEnum && !modelProperty.hasValidation && !cm.isArrayModel) {
                         // remove these models because they are aliases and do not have any enums or validations
                         modelSchemasToRemove.put(cm.name, modelSchema);
                     }
-                } else if (cm.isArrayModel && !modelProperty.isEnum && !modelProperty.hasValidation) {
-                    // remove any ArrayModels which lack validation and enums
-                    modelSchemasToRemove.put(cm.name, modelSchema);
                 }
             }
         }
@@ -829,10 +827,10 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
         result.unescapedDescription = simpleModelName(name);
 
         // make non-object type models have one property so we can use it to store enums and validations
-        if (result.isAlias || result.isEnum) {
+        if (result.isAlias || result.isEnum || result.isArrayModel) {
             Schema modelSchema = ModelUtils.getSchema(this.openAPI, result.name);
             CodegenProperty modelProperty = fromProperty("value", modelSchema);
-            if (modelProperty.isEnum == true || modelProperty.hasValidation == true) {
+            if (modelProperty.isEnum == true || modelProperty.hasValidation == true || result.isArrayModel) {
                 // these models are non-object models with enums and/or validations
                 // add a single property to the model so we can have a way to access validations
                 result.isAlias = true;
@@ -847,7 +845,6 @@ public class PythonClientExperimentalCodegen extends PythonClientCodegen {
                         postProcessModelProperty(result, prop);
                     }
                 }
-
             }
         }
 
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache
index 0790c614357..490629c5a38 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/model.mustache
@@ -37,7 +37,12 @@ from {{packageName}}.model_utils import (  # noqa: F401
 {{> python-experimental/model_templates/model_simple }}
 {{/isAlias}}
 {{^isAlias}}
+{{#isArrayModel}}
+{{> python-experimental/model_templates/model_simple }}
+{{/isArrayModel}}
+{{^isArrayModel}}
 {{> python-experimental/model_templates/model_normal }}
+{{/isArrayModel}}
 {{/isAlias}}
 {{/interfaces}}
 {{#interfaces}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
index 8ad4990a554..143429cb2ac 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/python/PythonClientExperimentalTest.java
@@ -270,7 +270,7 @@ public class PythonClientExperimentalTest {
         Assert.assertEquals(cm.classname, "sample.Sample");
         Assert.assertEquals(cm.classVarName, "sample");
         Assert.assertEquals(cm.description, "an array model");
-        Assert.assertEquals(cm.vars.size(), 0);
+        Assert.assertEquals(cm.vars.size(), 1);  // there is one value for Childer definition
         Assert.assertEquals(cm.parent, "list");
         Assert.assertEquals(cm.imports.size(), 1);
         Assert.assertEquals(Sets.intersection(cm.imports, Sets.newHashSet("children.Children")).size(), 1);
diff --git a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
index c9bf37fe1a1..a0f064611b1 100644
--- a/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/python-experimental/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
@@ -1099,6 +1099,19 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/HealthCheckResult'
+  /fake/array-of-enums:
+    get:
+      tags:
+        - fake
+      summary: Array of Enums
+      operationId: getArrayOfEnums
+      responses:
+        200:
+          description: Got named array of enums
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ArrayOfEnums'
 servers:
   - url: 'http://{server}.swagger.io:{port}/v2'
     description: petstore server
@@ -2074,6 +2087,10 @@ components:
           properties:
             name:
               type: string
+    ArrayOfEnums:
+      type: array
+      items:
+        $ref: '#/components/schemas/OuterEnum'
     DateTimeTest:
       type: string
       default: '2010-01-01T10:10:10.000111+01:00'
diff --git a/samples/client/petstore/python-experimental/.openapi-generator/FILES b/samples/client/petstore/python-experimental/.openapi-generator/FILES
index d282130ffbc..6e7ed3cb31a 100644
--- a/samples/client/petstore/python-experimental/.openapi-generator/FILES
+++ b/samples/client/petstore/python-experimental/.openapi-generator/FILES
@@ -11,6 +11,7 @@ docs/AdditionalPropertiesNumber.md
 docs/AdditionalPropertiesObject.md
 docs/AdditionalPropertiesString.md
 docs/Animal.md
+docs/AnimalFarm.md
 docs/AnotherFakeApi.md
 docs/ApiResponse.md
 docs/ArrayOfArrayOfNumberOnly.md
@@ -93,6 +94,7 @@ petstore_api/model/additional_properties_number.py
 petstore_api/model/additional_properties_object.py
 petstore_api/model/additional_properties_string.py
 petstore_api/model/animal.py
+petstore_api/model/animal_farm.py
 petstore_api/model/api_response.py
 petstore_api/model/array_of_array_of_number_only.py
 petstore_api/model/array_of_number_only.py
diff --git a/samples/client/petstore/python-experimental/README.md b/samples/client/petstore/python-experimental/README.md
index d6b85d02a55..9826cfaf987 100644
--- a/samples/client/petstore/python-experimental/README.md
+++ b/samples/client/petstore/python-experimental/README.md
@@ -131,6 +131,7 @@ Class | Method | HTTP request | Description
  - [additional_properties_object.AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
  - [additional_properties_string.AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
  - [animal.Animal](docs/Animal.md)
+ - [animal_farm.AnimalFarm](docs/AnimalFarm.md)
  - [api_response.ApiResponse](docs/ApiResponse.md)
  - [array_of_array_of_number_only.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [array_of_number_only.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
diff --git a/samples/client/petstore/python-experimental/docs/AnimalFarm.md b/samples/client/petstore/python-experimental/docs/AnimalFarm.md
new file mode 100644
index 00000000000..c9976c7ddab
--- /dev/null
+++ b/samples/client/petstore/python-experimental/docs/AnimalFarm.md
@@ -0,0 +1,10 @@
+# animal_farm.AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**[animal.Animal]**](Animal.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/python-experimental/petstore_api/model/animal_farm.py b/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
new file mode 100644
index 00000000000..3e6d723ff2b
--- /dev/null
+++ b/samples/client/petstore/python-experimental/petstore_api/model/animal_farm.py
@@ -0,0 +1,173 @@
+# 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 re  # noqa: F401
+import sys  # noqa: F401
+
+import six  # noqa: F401
+import nulltype  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_get_composed_info,
+)
+try:
+    from petstore_api.model import animal
+except ImportError:
+    animal = sys.modules[
+        'petstore_api.model.animal']
+
+
+class AnimalFarm(ModelSimple):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    additional_properties_type = None
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a class method so a model may have properties that are
+        of type self, this ensures that we don't create a cyclic import
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+            'value': ([animal.Animal],),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+    _composed_schemas = None
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, value, *args, **kwargs):  # noqa: E501
+        """animal_farm.AnimalFarm - a model defined in OpenAPI
+
+        Args:
+            value ([animal.Animal]):
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            raise ApiTypeError(
+                "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        self.value = value
+        for var_name, var_value in six.iteritems(kwargs):
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
diff --git a/samples/client/petstore/python-experimental/petstore_api/models/__init__.py b/samples/client/petstore/python-experimental/petstore_api/models/__init__.py
index 51bdb1a85a5..e70777afd69 100644
--- a/samples/client/petstore/python-experimental/petstore_api/models/__init__.py
+++ b/samples/client/petstore/python-experimental/petstore_api/models/__init__.py
@@ -20,6 +20,7 @@ from petstore_api.model.additional_properties_number import AdditionalProperties
 from petstore_api.model.additional_properties_object import AdditionalPropertiesObject
 from petstore_api.model.additional_properties_string import AdditionalPropertiesString
 from petstore_api.model.animal import Animal
+from petstore_api.model.animal_farm import AnimalFarm
 from petstore_api.model.api_response import ApiResponse
 from petstore_api.model.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
 from petstore_api.model.array_of_number_only import ArrayOfNumberOnly
diff --git a/samples/client/petstore/python-experimental/test/test_animal_farm.py b/samples/client/petstore/python-experimental/test/test_animal_farm.py
new file mode 100644
index 00000000000..7117d42b430
--- /dev/null
+++ b/samples/client/petstore/python-experimental/test/test_animal_farm.py
@@ -0,0 +1,43 @@
+# 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 sys
+import unittest
+
+import petstore_api
+try:
+    from petstore_api.model import animal
+except ImportError:
+    animal = sys.modules[
+        'petstore_api.model.animal']
+from petstore_api.model.animal_farm import AnimalFarm
+
+
+class TestAnimalFarm(unittest.TestCase):
+    """AnimalFarm unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAnimalFarm(self):
+        """Test AnimalFarm"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = AnimalFarm()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
index ffc326a12f0..0d022fe2bde 100644
--- a/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/python-experimental/.openapi-generator/FILES
@@ -5,11 +5,13 @@ README.md
 docs/AdditionalPropertiesClass.md
 docs/Address.md
 docs/Animal.md
+docs/AnimalFarm.md
 docs/AnotherFakeApi.md
 docs/ApiResponse.md
 docs/Apple.md
 docs/AppleReq.md
 docs/ArrayOfArrayOfNumberOnly.md
+docs/ArrayOfEnums.md
 docs/ArrayOfNumberOnly.md
 docs/ArrayTest.md
 docs/Banana.md
@@ -109,10 +111,12 @@ petstore_api/model/__init__.py
 petstore_api/model/additional_properties_class.py
 petstore_api/model/address.py
 petstore_api/model/animal.py
+petstore_api/model/animal_farm.py
 petstore_api/model/api_response.py
 petstore_api/model/apple.py
 petstore_api/model/apple_req.py
 petstore_api/model/array_of_array_of_number_only.py
+petstore_api/model/array_of_enums.py
 petstore_api/model/array_of_number_only.py
 petstore_api/model/array_test.py
 petstore_api/model/banana.py
diff --git a/samples/openapi3/client/petstore/python-experimental/README.md b/samples/openapi3/client/petstore/python-experimental/README.md
index a542d727b93..3c16a26ddc6 100644
--- a/samples/openapi3/client/petstore/python-experimental/README.md
+++ b/samples/openapi3/client/petstore/python-experimental/README.md
@@ -87,6 +87,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* | [**get_array_of_enums**](docs/FakeApi.md#get_array_of_enums) | **GET** /fake/array-of-enums | Array of Enums
 *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
@@ -125,10 +126,12 @@ Class | Method | HTTP request | Description
  - [additional_properties_class.AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
  - [address.Address](docs/Address.md)
  - [animal.Animal](docs/Animal.md)
+ - [animal_farm.AnimalFarm](docs/AnimalFarm.md)
  - [api_response.ApiResponse](docs/ApiResponse.md)
  - [apple.Apple](docs/Apple.md)
  - [apple_req.AppleReq](docs/AppleReq.md)
  - [array_of_array_of_number_only.ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [array_of_enums.ArrayOfEnums](docs/ArrayOfEnums.md)
  - [array_of_number_only.ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [array_test.ArrayTest](docs/ArrayTest.md)
  - [banana.Banana](docs/Banana.md)
diff --git a/samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md b/samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md
new file mode 100644
index 00000000000..c9976c7ddab
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/docs/AnimalFarm.md
@@ -0,0 +1,10 @@
+# animal_farm.AnimalFarm
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**[animal.Animal]**](Animal.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-experimental/docs/ArrayOfEnums.md b/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfEnums.md
new file mode 100644
index 00000000000..ad9394655bc
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/docs/ArrayOfEnums.md
@@ -0,0 +1,10 @@
+# array_of_enums.ArrayOfEnums
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**value** | [**[outer_enum.OuterEnum, none_type]**](OuterEnum.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-experimental/docs/FakeApi.md b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
index 6bd8936f1b5..6a79ea1c772 100644
--- a/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/python-experimental/docs/FakeApi.md
@@ -9,6 +9,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 | 
+[**get_array_of_enums**](FakeApi.md#get_array_of_enums) | **GET** /fake/array-of-enums | Array of Enums
 [**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
@@ -331,6 +332,64 @@ 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)
 
+# **get_array_of_enums**
+> array_of_enums.ArrayOfEnums get_array_of_enums()
+
+Array of Enums
+
+### Example
+
+```python
+from __future__ import print_function
+import time
+import petstore_api
+from petstore_api.api import fake_api
+from petstore_api.model import array_of_enums
+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 = fake_api.FakeApi(api_client)
+    
+    # example, this endpoint has no required or optional parameters
+    try:
+        # Array of Enums
+        api_response = api_instance.get_array_of_enums()
+        pprint(api_response)
+    except petstore_api.ApiException as e:
+        print("Exception when calling FakeApi->get_array_of_enums: %s\n" % e)
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**array_of_enums.ArrayOfEnums**](ArrayOfEnums.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+**200** | Got named array of enums |  -  |
+
+[[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/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
index 69531b0525f..3c5de6178be 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
@@ -36,6 +36,7 @@ from petstore_api.model_utils import (  # noqa: F401
 )
 from petstore_api.model import health_check_result
 from petstore_api.model import outer_composite
+from petstore_api.model import array_of_enums
 from petstore_api.model import file_schema_test_class
 from petstore_api.model import user
 from petstore_api.model import client
@@ -600,6 +601,109 @@ class FakeApi(object):
             callable=__fake_outer_string_serialize
         )
 
+        def __get_array_of_enums(
+            self,
+            **kwargs
+        ):
+            """Array of Enums  # noqa: E501
+
+            This method makes a synchronous HTTP request by default. To make an
+            asynchronous HTTP request, please pass async_req=True
+            >>> thread = api.get_array_of_enums(async_req=True)
+            >>> result = thread.get()
+
+
+            Keyword Args:
+                _return_http_data_only (bool): response data without head status
+                    code and headers. Default is True.
+                _preload_content (bool): if False, the urllib3.HTTPResponse object
+                    will be returned without reading/decoding response data.
+                    Default is True.
+                _request_timeout (float/tuple): 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.
+                    Default is None.
+                _check_input_type (bool): specifies if type checking
+                    should be done one the data sent to the server.
+                    Default is True.
+                _check_return_type (bool): specifies if type checking
+                    should be done one the data received from the server.
+                    Default is True.
+                _host_index (int): specifies the index of the server
+                    that we want to use.
+                    Default is 0.
+                async_req (bool): execute request asynchronously
+
+            Returns:
+                array_of_enums.ArrayOfEnums
+                    If the method is called asynchronously, returns the request
+                    thread.
+            """
+            kwargs['async_req'] = kwargs.get(
+                'async_req', False
+            )
+            kwargs['_return_http_data_only'] = kwargs.get(
+                '_return_http_data_only', True
+            )
+            kwargs['_preload_content'] = kwargs.get(
+                '_preload_content', True
+            )
+            kwargs['_request_timeout'] = kwargs.get(
+                '_request_timeout', None
+            )
+            kwargs['_check_input_type'] = kwargs.get(
+                '_check_input_type', True
+            )
+            kwargs['_check_return_type'] = kwargs.get(
+                '_check_return_type', True
+            )
+            kwargs['_host_index'] = kwargs.get('_host_index', 0)
+            return self.call_with_http_info(**kwargs)
+
+        self.get_array_of_enums = Endpoint(
+            settings={
+                'response_type': (array_of_enums.ArrayOfEnums,),
+                'auth': [],
+                'endpoint_path': '/fake/array-of-enums',
+                'operation_id': 'get_array_of_enums',
+                'http_method': 'GET',
+                'servers': [],
+            },
+            params_map={
+                'all': [
+                ],
+                'required': [],
+                'nullable': [
+                ],
+                'enum': [
+                ],
+                'validation': [
+                ]
+            },
+            root_map={
+                'validations': {
+                },
+                'allowed_values': {
+                },
+                'openapi_types': {
+                },
+                'attribute_map': {
+                },
+                'location_map': {
+                },
+                'collection_format_map': {
+                }
+            },
+            headers_map={
+                'accept': [
+                    'application/json'
+                ],
+                'content_type': [],
+            },
+            api_client=api_client,
+            callable=__get_array_of_enums
+        )
+
         def __test_body_with_file_schema(
             self,
             file_schema_test_class_file_schema_test_class,
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
new file mode 100644
index 00000000000..3e6d723ff2b
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/animal_farm.py
@@ -0,0 +1,173 @@
+# 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 re  # noqa: F401
+import sys  # noqa: F401
+
+import six  # noqa: F401
+import nulltype  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_get_composed_info,
+)
+try:
+    from petstore_api.model import animal
+except ImportError:
+    animal = sys.modules[
+        'petstore_api.model.animal']
+
+
+class AnimalFarm(ModelSimple):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    additional_properties_type = None
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a class method so a model may have properties that are
+        of type self, this ensures that we don't create a cyclic import
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+            'value': ([animal.Animal],),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+    _composed_schemas = None
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, value, *args, **kwargs):  # noqa: E501
+        """animal_farm.AnimalFarm - a model defined in OpenAPI
+
+        Args:
+            value ([animal.Animal]):
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            raise ApiTypeError(
+                "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        self.value = value
+        for var_name, var_value in six.iteritems(kwargs):
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
new file mode 100644
index 00000000000..0bea865e36c
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/model/array_of_enums.py
@@ -0,0 +1,173 @@
+# 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 re  # noqa: F401
+import sys  # noqa: F401
+
+import six  # noqa: F401
+import nulltype  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    int,
+    none_type,
+    str,
+    validate_get_composed_info,
+)
+try:
+    from petstore_api.model import outer_enum
+except ImportError:
+    outer_enum = sys.modules[
+        'petstore_api.model.outer_enum']
+
+
+class ArrayOfEnums(ModelSimple):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    additional_properties_type = None
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a class method so a model may have properties that are
+        of type self, this ensures that we don't create a cyclic import
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+            'value': ([outer_enum.OuterEnum, none_type],),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+    _composed_schemas = None
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, value, *args, **kwargs):  # noqa: E501
+        """array_of_enums.ArrayOfEnums - a model defined in OpenAPI
+
+        Args:
+            value ([outer_enum.OuterEnum, none_type]):
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            raise ApiTypeError(
+                "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                    args,
+                    self.__class__.__name__,
+                ),
+                path_to_item=_path_to_item,
+                valid_classes=(self.__class__,),
+            )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        self.value = value
+        for var_name, var_value in six.iteritems(kwargs):
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
index 7c58ced9f86..7f3b8ea8ed9 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/models/__init__.py
@@ -14,10 +14,12 @@
 from petstore_api.model.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.model.address import Address
 from petstore_api.model.animal import Animal
+from petstore_api.model.animal_farm import AnimalFarm
 from petstore_api.model.api_response import ApiResponse
 from petstore_api.model.apple import Apple
 from petstore_api.model.apple_req import AppleReq
 from petstore_api.model.array_of_array_of_number_only import ArrayOfArrayOfNumberOnly
+from petstore_api.model.array_of_enums import ArrayOfEnums
 from petstore_api.model.array_of_number_only import ArrayOfNumberOnly
 from petstore_api.model.array_test import ArrayTest
 from petstore_api.model.banana import Banana
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_animal_farm.py b/samples/openapi3/client/petstore/python-experimental/test/test_animal_farm.py
new file mode 100644
index 00000000000..7117d42b430
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_animal_farm.py
@@ -0,0 +1,43 @@
+# 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 sys
+import unittest
+
+import petstore_api
+try:
+    from petstore_api.model import animal
+except ImportError:
+    animal = sys.modules[
+        'petstore_api.model.animal']
+from petstore_api.model.animal_farm import AnimalFarm
+
+
+class TestAnimalFarm(unittest.TestCase):
+    """AnimalFarm unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testAnimalFarm(self):
+        """Test AnimalFarm"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = AnimalFarm()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/test/test_array_of_enums.py b/samples/openapi3/client/petstore/python-experimental/test/test_array_of_enums.py
new file mode 100644
index 00000000000..2b9007e564f
--- /dev/null
+++ b/samples/openapi3/client/petstore/python-experimental/test/test_array_of_enums.py
@@ -0,0 +1,43 @@
+# 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 sys
+import unittest
+
+import petstore_api
+try:
+    from petstore_api.model import outer_enum
+except ImportError:
+    outer_enum = sys.modules[
+        'petstore_api.model.outer_enum']
+from petstore_api.model.array_of_enums import ArrayOfEnums
+
+
+class TestArrayOfEnums(unittest.TestCase):
+    """ArrayOfEnums unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testArrayOfEnums(self):
+        """Test ArrayOfEnums"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = ArrayOfEnums()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py b/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
index edf48ad0160..e9eb0a70f78 100644
--- a/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
+++ b/samples/openapi3/client/petstore/python-experimental/tests/test_api_validation.py
@@ -21,7 +21,9 @@ from dateutil.parser import parse
 from collections import namedtuple
 
 import petstore_api
+from petstore_api.model import array_of_enums
 from petstore_api.model import format_test
+from petstore_api.model import outer_enum
 import petstore_api.configuration
 
 HOST = 'http://petstore.swagger.io/v2'
@@ -42,6 +44,14 @@ class ApiClientTests(unittest.TestCase):
             config.disabled_client_side_validations = 'foo'
         config.disabled_client_side_validations = ""
 
+    def test_array_of_enums(self):
+        data = [
+            "placed", None
+        ]
+        response = MockResponse(data=json.dumps(data))
+        deserialized = self.api_client.deserialize(response, (array_of_enums.ArrayOfEnums, ), True)
+        assert isinstance(deserialized, array_of_enums.ArrayOfEnums)
+        assert array_of_enums.ArrayOfEnums([outer_enum.OuterEnum(v) for v in data]) == deserialized
 
     def checkRaiseRegex(self, expected_exception, expected_regex):
         if sys.version_info < (3, 0):

From 6f6c8ede798836740dc166375dba411a0ffe35ae Mon Sep 17 00:00:00 2001
From: Alexey Volkov <alexey.volkov@ark-kun.com>
Date: Thu, 4 Jun 2020 08:46:35 -0700
Subject: [PATCH 22/22] [Python] Fixed docstrings in api.mustache (#6391)

* [Python] Fixed docstrings

Fixes https://github.com/swagger-api/swagger-codegen/issues/9630

* Updated generated files

* Fixed python-experimental

* Updated generated files

* Fully fixed the format of the docstrings

* Updated generated files

* Updated generated files in openapi3
---
 .../src/main/resources/python/api.mustache    |  23 +-
 .../src/main/resources/python/model.mustache  |   2 +-
 .../python/python-experimental/api.mustache   |   1 +
 .../python-experimental/api_client.mustache   |  15 +-
 .../petstore_api/api/another_fake_api.py      |  23 +-
 .../petstore_api/api/fake_api.py              | 508 ++++++++++++-----
 .../api/fake_classname_tags_123_api.py        |  23 +-
 .../petstore_api/api/pet_api.py               | 249 +++++---
 .../petstore_api/api/store_api.py             |  86 ++-
 .../petstore_api/api/user_api.py              | 190 +++++--
 .../models/additional_properties_any_type.py  |   2 +-
 .../models/additional_properties_array.py     |   2 +-
 .../models/additional_properties_boolean.py   |   2 +-
 .../models/additional_properties_class.py     |  22 +-
 .../models/additional_properties_integer.py   |   2 +-
 .../models/additional_properties_number.py    |   2 +-
 .../models/additional_properties_object.py    |   2 +-
 .../models/additional_properties_string.py    |   2 +-
 .../petstore_api/models/animal.py             |   4 +-
 .../petstore_api/models/api_response.py       |   6 +-
 .../models/array_of_array_of_number_only.py   |   2 +-
 .../models/array_of_number_only.py            |   2 +-
 .../petstore_api/models/array_test.py         |   6 +-
 .../petstore_api/models/big_cat.py            |   2 +-
 .../petstore_api/models/big_cat_all_of.py     |   2 +-
 .../petstore_api/models/capitalization.py     |  12 +-
 .../python-asyncio/petstore_api/models/cat.py |   2 +-
 .../petstore_api/models/cat_all_of.py         |   2 +-
 .../petstore_api/models/category.py           |   4 +-
 .../petstore_api/models/class_model.py        |   2 +-
 .../petstore_api/models/client.py             |   2 +-
 .../python-asyncio/petstore_api/models/dog.py |   2 +-
 .../petstore_api/models/dog_all_of.py         |   2 +-
 .../petstore_api/models/enum_arrays.py        |   4 +-
 .../petstore_api/models/enum_test.py          |  10 +-
 .../petstore_api/models/file.py               |   2 +-
 .../models/file_schema_test_class.py          |   4 +-
 .../petstore_api/models/format_test.py        |  28 +-
 .../petstore_api/models/has_only_read_only.py |   4 +-
 .../petstore_api/models/list.py               |   2 +-
 .../petstore_api/models/map_test.py           |   8 +-
 ...perties_and_additional_properties_class.py |   6 +-
 .../petstore_api/models/model200_response.py  |   4 +-
 .../petstore_api/models/model_return.py       |   2 +-
 .../petstore_api/models/name.py               |   8 +-
 .../petstore_api/models/number_only.py        |   2 +-
 .../petstore_api/models/order.py              |  12 +-
 .../petstore_api/models/outer_composite.py    |   6 +-
 .../python-asyncio/petstore_api/models/pet.py |  12 +-
 .../petstore_api/models/read_only_first.py    |   4 +-
 .../petstore_api/models/special_model_name.py |   2 +-
 .../python-asyncio/petstore_api/models/tag.py |   4 +-
 .../models/type_holder_default.py             |  10 +-
 .../models/type_holder_example.py             |  12 +-
 .../petstore_api/models/user.py               |  16 +-
 .../petstore_api/models/xml_item.py           |  58 +-
 .../petstore_api/api/another_fake_api.py      |   1 +
 .../petstore_api/api/fake_api.py              |  15 +
 .../api/fake_classname_tags_123_api.py        |   1 +
 .../petstore_api/api/pet_api.py               |   9 +
 .../petstore_api/api/store_api.py             |   4 +
 .../petstore_api/api/user_api.py              |   8 +
 .../petstore_api/api_client.py                |  15 +-
 .../petstore_api/api/another_fake_api.py      |  23 +-
 .../petstore_api/api/fake_api.py              | 508 ++++++++++++-----
 .../api/fake_classname_tags_123_api.py        |  23 +-
 .../petstore_api/api/pet_api.py               | 249 +++++---
 .../petstore_api/api/store_api.py             |  86 ++-
 .../petstore_api/api/user_api.py              | 190 +++++--
 .../models/additional_properties_any_type.py  |   2 +-
 .../models/additional_properties_array.py     |   2 +-
 .../models/additional_properties_boolean.py   |   2 +-
 .../models/additional_properties_class.py     |  22 +-
 .../models/additional_properties_integer.py   |   2 +-
 .../models/additional_properties_number.py    |   2 +-
 .../models/additional_properties_object.py    |   2 +-
 .../models/additional_properties_string.py    |   2 +-
 .../petstore_api/models/animal.py             |   4 +-
 .../petstore_api/models/api_response.py       |   6 +-
 .../models/array_of_array_of_number_only.py   |   2 +-
 .../models/array_of_number_only.py            |   2 +-
 .../petstore_api/models/array_test.py         |   6 +-
 .../petstore_api/models/big_cat.py            |   2 +-
 .../petstore_api/models/big_cat_all_of.py     |   2 +-
 .../petstore_api/models/capitalization.py     |  12 +-
 .../python-tornado/petstore_api/models/cat.py |   2 +-
 .../petstore_api/models/cat_all_of.py         |   2 +-
 .../petstore_api/models/category.py           |   4 +-
 .../petstore_api/models/class_model.py        |   2 +-
 .../petstore_api/models/client.py             |   2 +-
 .../python-tornado/petstore_api/models/dog.py |   2 +-
 .../petstore_api/models/dog_all_of.py         |   2 +-
 .../petstore_api/models/enum_arrays.py        |   4 +-
 .../petstore_api/models/enum_test.py          |  10 +-
 .../petstore_api/models/file.py               |   2 +-
 .../models/file_schema_test_class.py          |   4 +-
 .../petstore_api/models/format_test.py        |  28 +-
 .../petstore_api/models/has_only_read_only.py |   4 +-
 .../petstore_api/models/list.py               |   2 +-
 .../petstore_api/models/map_test.py           |   8 +-
 ...perties_and_additional_properties_class.py |   6 +-
 .../petstore_api/models/model200_response.py  |   4 +-
 .../petstore_api/models/model_return.py       |   2 +-
 .../petstore_api/models/name.py               |   8 +-
 .../petstore_api/models/number_only.py        |   2 +-
 .../petstore_api/models/order.py              |  12 +-
 .../petstore_api/models/outer_composite.py    |   6 +-
 .../python-tornado/petstore_api/models/pet.py |  12 +-
 .../petstore_api/models/read_only_first.py    |   4 +-
 .../petstore_api/models/special_model_name.py |   2 +-
 .../python-tornado/petstore_api/models/tag.py |   4 +-
 .../models/type_holder_default.py             |  10 +-
 .../models/type_holder_example.py             |  12 +-
 .../petstore_api/models/user.py               |  16 +-
 .../petstore_api/models/xml_item.py           |  58 +-
 .../petstore_api/api/another_fake_api.py      |  23 +-
 .../python/petstore_api/api/fake_api.py       | 508 ++++++++++++-----
 .../api/fake_classname_tags_123_api.py        |  23 +-
 .../python/petstore_api/api/pet_api.py        | 249 +++++---
 .../python/petstore_api/api/store_api.py      |  86 ++-
 .../python/petstore_api/api/user_api.py       | 190 +++++--
 .../models/additional_properties_any_type.py  |   2 +-
 .../models/additional_properties_array.py     |   2 +-
 .../models/additional_properties_boolean.py   |   2 +-
 .../models/additional_properties_class.py     |  22 +-
 .../models/additional_properties_integer.py   |   2 +-
 .../models/additional_properties_number.py    |   2 +-
 .../models/additional_properties_object.py    |   2 +-
 .../models/additional_properties_string.py    |   2 +-
 .../python/petstore_api/models/animal.py      |   4 +-
 .../petstore_api/models/api_response.py       |   6 +-
 .../models/array_of_array_of_number_only.py   |   2 +-
 .../models/array_of_number_only.py            |   2 +-
 .../python/petstore_api/models/array_test.py  |   6 +-
 .../python/petstore_api/models/big_cat.py     |   2 +-
 .../petstore_api/models/big_cat_all_of.py     |   2 +-
 .../petstore_api/models/capitalization.py     |  12 +-
 .../python/petstore_api/models/cat.py         |   2 +-
 .../python/petstore_api/models/cat_all_of.py  |   2 +-
 .../python/petstore_api/models/category.py    |   4 +-
 .../python/petstore_api/models/class_model.py |   2 +-
 .../python/petstore_api/models/client.py      |   2 +-
 .../python/petstore_api/models/dog.py         |   2 +-
 .../python/petstore_api/models/dog_all_of.py  |   2 +-
 .../python/petstore_api/models/enum_arrays.py |   4 +-
 .../python/petstore_api/models/enum_test.py   |  10 +-
 .../python/petstore_api/models/file.py        |   2 +-
 .../models/file_schema_test_class.py          |   4 +-
 .../python/petstore_api/models/format_test.py |  28 +-
 .../petstore_api/models/has_only_read_only.py |   4 +-
 .../python/petstore_api/models/list.py        |   2 +-
 .../python/petstore_api/models/map_test.py    |   8 +-
 ...perties_and_additional_properties_class.py |   6 +-
 .../petstore_api/models/model200_response.py  |   4 +-
 .../petstore_api/models/model_return.py       |   2 +-
 .../python/petstore_api/models/name.py        |   8 +-
 .../python/petstore_api/models/number_only.py |   2 +-
 .../python/petstore_api/models/order.py       |  12 +-
 .../petstore_api/models/outer_composite.py    |   6 +-
 .../python/petstore_api/models/pet.py         |  12 +-
 .../petstore_api/models/read_only_first.py    |   4 +-
 .../petstore_api/models/special_model_name.py |   2 +-
 .../python/petstore_api/models/tag.py         |   4 +-
 .../models/type_holder_default.py             |  10 +-
 .../models/type_holder_example.py             |  12 +-
 .../python/petstore_api/models/user.py        |  16 +-
 .../python/petstore_api/models/xml_item.py    |  58 +-
 .../petstore_api/api/another_fake_api.py      |   1 +
 .../petstore_api/api/default_api.py           |   1 +
 .../petstore_api/api/fake_api.py              |  14 +
 .../api/fake_classname_tags_123_api.py        |   1 +
 .../petstore_api/api/pet_api.py               |   9 +
 .../petstore_api/api/store_api.py             |   4 +
 .../petstore_api/api/user_api.py              |   8 +
 .../petstore_api/api_client.py                |  15 +-
 .../petstore_api/api/another_fake_api.py      |  23 +-
 .../python/petstore_api/api/default_api.py    |  17 +-
 .../python/petstore_api/api/fake_api.py       | 537 +++++++++++++-----
 .../api/fake_classname_tags_123_api.py        |  23 +-
 .../python/petstore_api/api/pet_api.py        | 249 +++++---
 .../python/petstore_api/api/store_api.py      |  86 ++-
 .../python/petstore_api/api/user_api.py       | 190 +++++--
 .../models/additional_properties_class.py     |   4 +-
 .../python/petstore_api/models/animal.py      |   4 +-
 .../petstore_api/models/api_response.py       |   6 +-
 .../models/array_of_array_of_number_only.py   |   2 +-
 .../models/array_of_number_only.py            |   2 +-
 .../python/petstore_api/models/array_test.py  |   6 +-
 .../petstore_api/models/capitalization.py     |  12 +-
 .../python/petstore_api/models/cat.py         |   2 +-
 .../python/petstore_api/models/cat_all_of.py  |   2 +-
 .../python/petstore_api/models/category.py    |   4 +-
 .../python/petstore_api/models/class_model.py |   2 +-
 .../python/petstore_api/models/client.py      |   2 +-
 .../python/petstore_api/models/dog.py         |   2 +-
 .../python/petstore_api/models/dog_all_of.py  |   2 +-
 .../python/petstore_api/models/enum_arrays.py |   4 +-
 .../python/petstore_api/models/enum_test.py   |  16 +-
 .../python/petstore_api/models/file.py        |   2 +-
 .../models/file_schema_test_class.py          |   4 +-
 .../python/petstore_api/models/foo.py         |   2 +-
 .../python/petstore_api/models/format_test.py |  30 +-
 .../petstore_api/models/has_only_read_only.py |   4 +-
 .../models/health_check_result.py             |   2 +-
 .../petstore_api/models/inline_object.py      |   4 +-
 .../petstore_api/models/inline_object1.py     |   4 +-
 .../petstore_api/models/inline_object2.py     |   4 +-
 .../petstore_api/models/inline_object3.py     |  28 +-
 .../petstore_api/models/inline_object4.py     |   4 +-
 .../petstore_api/models/inline_object5.py     |   4 +-
 .../models/inline_response_default.py         |   2 +-
 .../python/petstore_api/models/list.py        |   2 +-
 .../python/petstore_api/models/map_test.py    |   8 +-
 ...perties_and_additional_properties_class.py |   6 +-
 .../petstore_api/models/model200_response.py  |   4 +-
 .../petstore_api/models/model_return.py       |   2 +-
 .../python/petstore_api/models/name.py        |   8 +-
 .../petstore_api/models/nullable_class.py     |  24 +-
 .../python/petstore_api/models/number_only.py |   2 +-
 .../python/petstore_api/models/order.py       |  12 +-
 .../petstore_api/models/outer_composite.py    |   6 +-
 .../python/petstore_api/models/pet.py         |  12 +-
 .../petstore_api/models/read_only_first.py    |   4 +-
 .../petstore_api/models/special_model_name.py |   2 +-
 .../python/petstore_api/models/tag.py         |   4 +-
 .../python/petstore_api/models/user.py        |  16 +-
 .../.openapi-generator/VERSION                |   2 +-
 .../controllers/pet_controller.py             |   4 +-
 .../openapi_server/openapi/openapi.yaml       |  18 -
 .../test/test_pet_controller.py               |   2 -
 .../python-flask-python2/requirements.txt     |  16 +-
 .../test-requirements.txt                     |   2 +-
 .../petstore/python-flask-python2/tox.ini     |   4 +-
 .../python-flask/.openapi-generator/VERSION   |   2 +-
 .../controllers/pet_controller.py             |   4 +-
 .../openapi_server/openapi/openapi.yaml       |  18 -
 .../test/test_pet_controller.py               |   2 -
 .../petstore/python-flask/requirements.txt    |  11 +-
 .../python-flask/test-requirements.txt        |   2 +-
 .../server/petstore/python-flask/tox.ini      |   4 +-
 240 files changed, 3920 insertions(+), 1882 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/python/api.mustache b/modules/openapi-generator/src/main/resources/python/api.mustache
index f2c55418354..18ced57845e 100644
--- a/modules/openapi-generator/src/main/resources/python/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python/api.mustache
@@ -38,6 +38,7 @@ class {{classname}}(object):
 {{/notes}}
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
 {{#sortParamsByRequiredFlag}}
         >>> thread = api.{{operationId}}({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
@@ -46,20 +47,24 @@ class {{classname}}(object):
 {{/sortParamsByRequiredFlag}}
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
 {{#allParams}}
-        :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
+        :param {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
+        :type {{paramName}}: {{dataType}}{{#optional}}, optional{{/optional}}
 {{/allParams}}
+        :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: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: {{#returnType}}{{returnType}}{{/returnType}}{{^returnType}}None{{/returnType}}
         """
         kwargs['_return_http_data_only'] = True
         return self.{{operationId}}_with_http_info({{#sortParamsByRequiredFlag}}{{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}{{/sortParamsByRequiredFlag}}**kwargs)  # noqa: E501
@@ -72,6 +77,7 @@ class {{classname}}(object):
 {{/notes}}
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
 {{#sortParamsByRequiredFlag}}
         >>> thread = api.{{operationId}}_with_http_info({{#allParams}}{{#required}}{{paramName}}, {{/required}}{{/allParams}}async_req=True)
 {{/sortParamsByRequiredFlag}}
@@ -80,22 +86,27 @@ class {{classname}}(object):
 {{/sortParamsByRequiredFlag}}
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
 {{#allParams}}
-        :param {{dataType}} {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional{{#defaultValue}}, default to {{{.}}}{{/defaultValue}}){{/optional}}
+        :param {{paramName}}:{{#description}} {{{description}}}{{/description}}{{#required}} (required){{/required}}{{#optional}}(optional){{/optional}}
+        :type {{paramName}}: {{dataType}}{{#optional}}, optional{{/optional}}
 {{/allParams}}
+        :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.
-        :return: {{#returnType}}tuple({{returnType}}, status_code(int), headers(HTTPHeaderDict)){{/returnType}}{{^returnType}}None{{/returnType}}
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: {{#returnType}}tuple({{returnType}}, status_code(int), headers(HTTPHeaderDict)){{/returnType}}{{^returnType}}None{{/returnType}}
         """
 
         {{#servers.0}}
diff --git a/modules/openapi-generator/src/main/resources/python/model.mustache b/modules/openapi-generator/src/main/resources/python/model.mustache
index 112246604dc..2b3299a6f2b 100644
--- a/modules/openapi-generator/src/main/resources/python/model.mustache
+++ b/modules/openapi-generator/src/main/resources/python/model.mustache
@@ -107,7 +107,7 @@ class {{classname}}(object):
 {{/description}}
 
         :param {{name}}: The {{name}} of this {{classname}}.  # noqa: E501
-        :type: {{dataType}}
+        :type {{name}}: {{dataType}}
         """
 {{^isNullable}}
 {{#required}}
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
index 44fc3a89970..92e909165d6 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/api.mustache
@@ -66,6 +66,7 @@ class {{classname}}(object):
 {{/notes}}
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.{{operationId}}({{#requiredParams}}{{^defaultValue}}{{paramName}}, {{/defaultValue}}{{/requiredParams}}{{#requiredParams}}{{#defaultValue}}{{paramName}}={{{defaultValue}}}, {{/defaultValue}}{{/requiredParams}}async_req=True)
             >>> result = thread.get()
 
diff --git a/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache b/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
index 5285a7b8064..d17177a8328 100644
--- a/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
+++ b/modules/openapi-generator/src/main/resources/python/python-experimental/api_client.mustache
@@ -291,6 +291,7 @@ class ApiClient(object):
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
         :param _check_type: boolean, whether to check the types of the data
             received from the server
+        :type _check_type: bool
 
         :return: deserialized object.
         """
@@ -350,22 +351,28 @@ class ApiClient(object):
             (float, none_type)
             ([int, none_type],)
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
-        :param files dict: key -> field name, value -> a list of open file
+        :param files: key -> field name, value -> a list of open file
             objects for `multipart/form-data`.
+        :type files: dict
         :param async_req bool: execute 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 collection_formats: dict of collection formats for path, query,
             header, and post parameters.
+        :type collection_formats: dict, 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 _check_type: boolean describing if the data back from the server
             should have its type checked.
+        :type _check_type: bool, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -559,9 +566,9 @@ class ApiClient(object):
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
-        :resource_path: A string representation of the HTTP request resource path.
-        :method: A string representation of the HTTP request method.
-        :body: A object representing the body of the HTTP request.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
             The object type is the return value of sanitize_for_serialization().
         """
         if not auth_settings:
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
index 77c4c003fe4..4d69b287ca8 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/another_fake_api.py
@@ -42,21 +42,26 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.call_123_test_special_tags_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
index 667c50612ce..e1d9ffebebf 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_api.py
@@ -42,21 +42,26 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_xml_item_with_http_info(xml_item, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -156,21 +167,26 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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: bool
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: bool
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_boolean_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -181,23 +197,29 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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.
-        :return: tuple(bool, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(bool, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -266,21 +288,26 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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: OuterComposite
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: OuterComposite
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_composite_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -291,23 +318,29 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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.
-        :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -376,21 +409,26 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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: float
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: float
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_number_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -401,23 +439,29 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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.
-        :return: tuple(float, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(float, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -486,21 +530,26 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_string_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -511,23 +560,29 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -596,21 +651,26 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_file_schema_with_http_info(body, **kwargs)  # noqa: E501
@@ -621,23 +681,29 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -709,22 +775,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_query_params_with_http_info(query, body, **kwargs)  # noqa: E501
@@ -734,24 +806,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -831,21 +910,26 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_client_model_with_http_info(body, **kwargs)  # noqa: E501
@@ -856,23 +940,29 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -949,34 +1039,52 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs)  # noqa: E501
@@ -987,36 +1095,55 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1168,28 +1295,40 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_enum_parameters_with_http_info(**kwargs)  # noqa: E501
@@ -1200,30 +1339,43 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1316,26 +1468,36 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs)  # noqa: E501
@@ -1346,28 +1508,39 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1458,21 +1631,26 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_inline_additional_properties_with_http_info(param, **kwargs)  # noqa: E501
@@ -1482,23 +1660,29 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1570,22 +1754,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_json_form_data_with_http_info(param, param2, **kwargs)  # noqa: E501
@@ -1595,24 +1785,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1692,25 +1889,34 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, **kwargs)  # noqa: E501
@@ -1721,27 +1927,37 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
index 2bb189bd01b..d963591a49a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/fake_classname_tags_123_api.py
@@ -42,21 +42,26 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_classname_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
index 5a297a57647..7002fe32740 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/pet_api.py
@@ -41,21 +41,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.add_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -65,23 +70,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -153,22 +164,28 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_pet_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -178,24 +195,31 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -267,21 +291,26 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_status_with_http_info(status, **kwargs)  # noqa: E501
@@ -292,23 +321,29 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -382,21 +417,26 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_tags_with_http_info(tags, **kwargs)  # noqa: E501
@@ -407,23 +447,29 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -497,21 +543,26 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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: Pet
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Pet
         """
         kwargs['_return_http_data_only'] = True
         return self.get_pet_by_id_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -522,23 +573,29 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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.
-        :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -610,21 +667,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -634,23 +696,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -722,23 +790,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_form_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -748,25 +823,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -844,23 +927,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -870,25 +960,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -970,23 +1068,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs)  # noqa: E501
@@ -996,25 +1101,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
index f693f755b74..0ede23f05ba 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/store_api.py
@@ -42,21 +42,26 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_order_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -152,20 +163,24 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: dict(str, int)
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: dict(str, int)
         """
         kwargs['_return_http_data_only'] = True
         return self.get_inventory_with_http_info(**kwargs)  # noqa: E501
@@ -176,22 +191,27 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -257,21 +277,26 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.get_order_by_id_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -282,23 +307,29 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -374,21 +405,26 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.place_order_with_http_info(body, **kwargs)  # noqa: E501
@@ -398,23 +434,29 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
index 9462f00716a..a912483b023 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/api/user_api.py
@@ -42,21 +42,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_user_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -151,21 +162,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_array_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -175,23 +191,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -259,21 +281,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_list_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -283,23 +310,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -368,21 +401,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_user_with_http_info(username, **kwargs)  # noqa: E501
@@ -393,23 +431,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -477,21 +521,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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: User
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: User
         """
         kwargs['_return_http_data_only'] = True
         return self.get_user_by_name_with_http_info(username, **kwargs)  # noqa: E501
@@ -501,23 +550,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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.
-        :return: tuple(User, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(User, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -589,22 +644,28 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.login_user_with_http_info(username, password, **kwargs)  # noqa: E501
@@ -614,24 +675,31 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user_with_http_info(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -710,20 +778,24 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.logout_user_with_http_info(**kwargs)  # noqa: E501
@@ -733,22 +805,27 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -810,22 +887,28 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_user_with_http_info(username, body, **kwargs)  # noqa: E501
@@ -836,24 +919,31 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user_with_http_info(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_any_type.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_any_type.py
index 2954285de87..690c71705b9 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_any_type.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_any_type.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesAnyType(object):
 
 
         :param name: The name of this AdditionalPropertiesAnyType.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_array.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_array.py
index c6369c22a12..f0902bdaffa 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_array.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_array.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesArray(object):
 
 
         :param name: The name of this AdditionalPropertiesArray.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_boolean.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_boolean.py
index 599b7c8b884..f79d2609a1d 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_boolean.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_boolean.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesBoolean(object):
 
 
         :param name: The name of this AdditionalPropertiesBoolean.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
index be4455c683b..ca334635175 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_class.py
@@ -118,7 +118,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_string: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, str)
+        :type map_string: dict(str, str)
         """
 
         self._map_string = map_string
@@ -139,7 +139,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_number: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, float)
+        :type map_number: dict(str, float)
         """
 
         self._map_number = map_number
@@ -160,7 +160,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_integer: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, int)
+        :type map_integer: dict(str, int)
         """
 
         self._map_integer = map_integer
@@ -181,7 +181,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_boolean: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, bool)
+        :type map_boolean: dict(str, bool)
         """
 
         self._map_boolean = map_boolean
@@ -202,7 +202,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_integer: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[int])
+        :type map_array_integer: dict(str, list[int])
         """
 
         self._map_array_integer = map_array_integer
@@ -223,7 +223,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_anytype: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[object])
+        :type map_array_anytype: dict(str, list[object])
         """
 
         self._map_array_anytype = map_array_anytype
@@ -244,7 +244,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_string: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_string: dict(str, dict(str, str))
         """
 
         self._map_map_string = map_map_string
@@ -265,7 +265,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_anytype: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, object))
+        :type map_map_anytype: dict(str, dict(str, object))
         """
 
         self._map_map_anytype = map_map_anytype
@@ -286,7 +286,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_1: The anytype_1 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_1: object
         """
 
         self._anytype_1 = anytype_1
@@ -307,7 +307,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_2: The anytype_2 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_2: object
         """
 
         self._anytype_2 = anytype_2
@@ -328,7 +328,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_3: The anytype_3 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_3: object
         """
 
         self._anytype_3 = anytype_3
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_integer.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_integer.py
index ddbb85fdf33..5c3ebf230d1 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_integer.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_integer.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesInteger(object):
 
 
         :param name: The name of this AdditionalPropertiesInteger.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_number.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_number.py
index 8bbeda83ecc..0e7f34ed329 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_number.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_number.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesNumber(object):
 
 
         :param name: The name of this AdditionalPropertiesNumber.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_object.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_object.py
index af87595b3e4..5a8ea94b929 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_object.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_object.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesObject(object):
 
 
         :param name: The name of this AdditionalPropertiesObject.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_string.py b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_string.py
index 6ab2c91feda..8436a1e345b 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_string.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/additional_properties_string.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesString(object):
 
 
         :param name: The name of this AdditionalPropertiesString.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
index b338e0eb18e..eef35ab093a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/animal.py
@@ -78,7 +78,7 @@ class Animal(object):
 
 
         :param class_name: The class_name of this Animal.  # noqa: E501
-        :type: str
+        :type class_name: str
         """
         if self.local_vars_configuration.client_side_validation and class_name is None:  # noqa: E501
             raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
@@ -101,7 +101,7 @@ class Animal(object):
 
 
         :param color: The color of this Animal.  # noqa: E501
-        :type: str
+        :type color: str
         """
 
         self._color = color
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
index 24e80d02aea..8cb64673c35 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/api_response.py
@@ -78,7 +78,7 @@ class ApiResponse(object):
 
 
         :param code: The code of this ApiResponse.  # noqa: E501
-        :type: int
+        :type code: int
         """
 
         self._code = code
@@ -99,7 +99,7 @@ class ApiResponse(object):
 
 
         :param type: The type of this ApiResponse.  # noqa: E501
-        :type: str
+        :type type: str
         """
 
         self._type = type
@@ -120,7 +120,7 @@ class ApiResponse(object):
 
 
         :param message: The message of this ApiResponse.  # noqa: E501
-        :type: str
+        :type message: str
         """
 
         self._message = message
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
index 1f654452077..41a689c534a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfArrayOfNumberOnly(object):
 
 
         :param array_array_number: The array_array_number of this ArrayOfArrayOfNumberOnly.  # noqa: E501
-        :type: list[list[float]]
+        :type array_array_number: list[list[float]]
         """
 
         self._array_array_number = array_array_number
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
index 27ba1f58e31..ddb7f7c7abe 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfNumberOnly(object):
 
 
         :param array_number: The array_number of this ArrayOfNumberOnly.  # noqa: E501
-        :type: list[float]
+        :type array_number: list[float]
         """
 
         self._array_number = array_number
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
index f34a372f6f3..e8e5c378f98 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/array_test.py
@@ -78,7 +78,7 @@ class ArrayTest(object):
 
 
         :param array_of_string: The array_of_string of this ArrayTest.  # noqa: E501
-        :type: list[str]
+        :type array_of_string: list[str]
         """
 
         self._array_of_string = array_of_string
@@ -99,7 +99,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_integer: The array_array_of_integer of this ArrayTest.  # noqa: E501
-        :type: list[list[int]]
+        :type array_array_of_integer: list[list[int]]
         """
 
         self._array_array_of_integer = array_array_of_integer
@@ -120,7 +120,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_model: The array_array_of_model of this ArrayTest.  # noqa: E501
-        :type: list[list[ReadOnlyFirst]]
+        :type array_array_of_model: list[list[ReadOnlyFirst]]
         """
 
         self._array_array_of_model = array_array_of_model
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/big_cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/big_cat.py
index fe52c3650ac..946981f5b7f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/big_cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/big_cat.py
@@ -68,7 +68,7 @@ class BigCat(object):
 
 
         :param kind: The kind of this BigCat.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/big_cat_all_of.py b/samples/client/petstore/python-asyncio/petstore_api/models/big_cat_all_of.py
index b75500db987..41c205d2576 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/big_cat_all_of.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/big_cat_all_of.py
@@ -68,7 +68,7 @@ class BigCatAllOf(object):
 
 
         :param kind: The kind of this BigCatAllOf.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
index cef34c5f6dc..967d324a0ab 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/capitalization.py
@@ -93,7 +93,7 @@ class Capitalization(object):
 
 
         :param small_camel: The small_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_camel: str
         """
 
         self._small_camel = small_camel
@@ -114,7 +114,7 @@ class Capitalization(object):
 
 
         :param capital_camel: The capital_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_camel: str
         """
 
         self._capital_camel = capital_camel
@@ -135,7 +135,7 @@ class Capitalization(object):
 
 
         :param small_snake: The small_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_snake: str
         """
 
         self._small_snake = small_snake
@@ -156,7 +156,7 @@ class Capitalization(object):
 
 
         :param capital_snake: The capital_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_snake: str
         """
 
         self._capital_snake = capital_snake
@@ -177,7 +177,7 @@ class Capitalization(object):
 
 
         :param sca_eth_flow_points: The sca_eth_flow_points of this Capitalization.  # noqa: E501
-        :type: str
+        :type sca_eth_flow_points: str
         """
 
         self._sca_eth_flow_points = sca_eth_flow_points
@@ -200,7 +200,7 @@ class Capitalization(object):
         Name of the pet   # noqa: E501
 
         :param att_name: The att_name of this Capitalization.  # noqa: E501
-        :type: str
+        :type att_name: str
         """
 
         self._att_name = att_name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
index e39c1c82508..b3b0d868c7f 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat.py
@@ -68,7 +68,7 @@ class Cat(object):
 
 
         :param declawed: The declawed of this Cat.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/cat_all_of.py b/samples/client/petstore/python-asyncio/petstore_api/models/cat_all_of.py
index 7e90fab9348..f573a04636c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/cat_all_of.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/cat_all_of.py
@@ -68,7 +68,7 @@ class CatAllOf(object):
 
 
         :param declawed: The declawed of this CatAllOf.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/category.py b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
index b47c148953e..11a7bf85f3a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/category.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/category.py
@@ -72,7 +72,7 @@ class Category(object):
 
 
         :param id: The id of this Category.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -93,7 +93,7 @@ class Category(object):
 
 
         :param name: The name of this Category.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
index ef6060ffa70..aac505ea064 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/class_model.py
@@ -68,7 +68,7 @@ class ClassModel(object):
 
 
         :param _class: The _class of this ClassModel.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/client.py b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
index ee5dbf1c43a..2006350b210 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/client.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/client.py
@@ -68,7 +68,7 @@ class Client(object):
 
 
         :param client: The client of this Client.  # noqa: E501
-        :type: str
+        :type client: str
         """
 
         self._client = client
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
index eacb63eedb0..fb9024d0bb7 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog.py
@@ -68,7 +68,7 @@ class Dog(object):
 
 
         :param breed: The breed of this Dog.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/dog_all_of.py b/samples/client/petstore/python-asyncio/petstore_api/models/dog_all_of.py
index 48e04855708..5943ba900dd 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/dog_all_of.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/dog_all_of.py
@@ -68,7 +68,7 @@ class DogAllOf(object):
 
 
         :param breed: The breed of this DogAllOf.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
index 819ff322157..ae2ea1d4251 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_arrays.py
@@ -73,7 +73,7 @@ class EnumArrays(object):
 
 
         :param just_symbol: The just_symbol of this EnumArrays.  # noqa: E501
-        :type: str
+        :type just_symbol: str
         """
         allowed_values = [">=", "$"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and just_symbol not in allowed_values:  # noqa: E501
@@ -100,7 +100,7 @@ class EnumArrays(object):
 
 
         :param array_enum: The array_enum of this EnumArrays.  # noqa: E501
-        :type: list[str]
+        :type array_enum: list[str]
         """
         allowed_values = ["fish", "crab"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
index 464281b3ec0..e9872c4d005 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/enum_test.py
@@ -87,7 +87,7 @@ class EnumTest(object):
 
 
         :param enum_string: The enum_string of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string: str
         """
         allowed_values = ["UPPER", "lower", ""]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_string not in allowed_values:  # noqa: E501
@@ -114,7 +114,7 @@ class EnumTest(object):
 
 
         :param enum_string_required: The enum_string_required of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string_required: str
         """
         if self.local_vars_configuration.client_side_validation and enum_string_required is None:  # noqa: E501
             raise ValueError("Invalid value for `enum_string_required`, must not be `None`")  # noqa: E501
@@ -143,7 +143,7 @@ class EnumTest(object):
 
 
         :param enum_integer: The enum_integer of this EnumTest.  # noqa: E501
-        :type: int
+        :type enum_integer: int
         """
         allowed_values = [1, -1]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_integer not in allowed_values:  # noqa: E501
@@ -170,7 +170,7 @@ class EnumTest(object):
 
 
         :param enum_number: The enum_number of this EnumTest.  # noqa: E501
-        :type: float
+        :type enum_number: float
         """
         allowed_values = [1.1, -1.2]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_number not in allowed_values:  # noqa: E501
@@ -197,7 +197,7 @@ class EnumTest(object):
 
 
         :param outer_enum: The outer_enum of this EnumTest.  # noqa: E501
-        :type: OuterEnum
+        :type outer_enum: OuterEnum
         """
 
         self._outer_enum = outer_enum
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/file.py b/samples/client/petstore/python-asyncio/petstore_api/models/file.py
index 282df2957e6..4fb5c31762e 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/file.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/file.py
@@ -70,7 +70,7 @@ class File(object):
         Test capitalization  # noqa: E501
 
         :param source_uri: The source_uri of this File.  # noqa: E501
-        :type: str
+        :type source_uri: str
         """
 
         self._source_uri = source_uri
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/file_schema_test_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/file_schema_test_class.py
index de7f865b47e..2f2d44a7b33 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/file_schema_test_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/file_schema_test_class.py
@@ -73,7 +73,7 @@ class FileSchemaTestClass(object):
 
 
         :param file: The file of this FileSchemaTestClass.  # noqa: E501
-        :type: File
+        :type file: File
         """
 
         self._file = file
@@ -94,7 +94,7 @@ class FileSchemaTestClass(object):
 
 
         :param files: The files of this FileSchemaTestClass.  # noqa: E501
-        :type: list[File]
+        :type files: list[File]
         """
 
         self._files = files
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
index 6396c442f62..c96f8132fa6 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/format_test.py
@@ -129,7 +129,7 @@ class FormatTest(object):
 
 
         :param integer: The integer of this FormatTest.  # noqa: E501
-        :type: int
+        :type integer: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 integer is not None and integer > 100):  # noqa: E501
@@ -156,7 +156,7 @@ class FormatTest(object):
 
 
         :param int32: The int32 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int32: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 int32 is not None and int32 > 200):  # noqa: E501
@@ -183,7 +183,7 @@ class FormatTest(object):
 
 
         :param int64: The int64 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int64: int
         """
 
         self._int64 = int64
@@ -204,7 +204,7 @@ class FormatTest(object):
 
 
         :param number: The number of this FormatTest.  # noqa: E501
-        :type: float
+        :type number: float
         """
         if self.local_vars_configuration.client_side_validation and number is None:  # noqa: E501
             raise ValueError("Invalid value for `number`, must not be `None`")  # noqa: E501
@@ -233,7 +233,7 @@ class FormatTest(object):
 
 
         :param float: The float of this FormatTest.  # noqa: E501
-        :type: float
+        :type float: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 float is not None and float > 987.6):  # noqa: E501
@@ -260,7 +260,7 @@ class FormatTest(object):
 
 
         :param double: The double of this FormatTest.  # noqa: E501
-        :type: float
+        :type double: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 double is not None and double > 123.4):  # noqa: E501
@@ -287,7 +287,7 @@ class FormatTest(object):
 
 
         :param string: The string of this FormatTest.  # noqa: E501
-        :type: str
+        :type string: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 string is not None and not re.search(r'[a-z]', string, flags=re.IGNORECASE)):  # noqa: E501
@@ -311,7 +311,7 @@ class FormatTest(object):
 
 
         :param byte: The byte of this FormatTest.  # noqa: E501
-        :type: str
+        :type byte: str
         """
         if self.local_vars_configuration.client_side_validation and byte is None:  # noqa: E501
             raise ValueError("Invalid value for `byte`, must not be `None`")  # noqa: E501
@@ -337,7 +337,7 @@ class FormatTest(object):
 
 
         :param binary: The binary of this FormatTest.  # noqa: E501
-        :type: file
+        :type binary: file
         """
 
         self._binary = binary
@@ -358,7 +358,7 @@ class FormatTest(object):
 
 
         :param date: The date of this FormatTest.  # noqa: E501
-        :type: date
+        :type date: date
         """
         if self.local_vars_configuration.client_side_validation and date is None:  # noqa: E501
             raise ValueError("Invalid value for `date`, must not be `None`")  # noqa: E501
@@ -381,7 +381,7 @@ class FormatTest(object):
 
 
         :param date_time: The date_time of this FormatTest.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -402,7 +402,7 @@ class FormatTest(object):
 
 
         :param uuid: The uuid of this FormatTest.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -423,7 +423,7 @@ class FormatTest(object):
 
 
         :param password: The password of this FormatTest.  # noqa: E501
-        :type: str
+        :type password: str
         """
         if self.local_vars_configuration.client_side_validation and password is None:  # noqa: E501
             raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
@@ -452,7 +452,7 @@ class FormatTest(object):
 
 
         :param big_decimal: The big_decimal of this FormatTest.  # noqa: E501
-        :type: BigDecimal
+        :type big_decimal: BigDecimal
         """
 
         self._big_decimal = big_decimal
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
index 5fc2f8a9ebd..fa496519ecb 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/has_only_read_only.py
@@ -73,7 +73,7 @@ class HasOnlyReadOnly(object):
 
 
         :param bar: The bar of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class HasOnlyReadOnly(object):
 
 
         :param foo: The foo of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type foo: str
         """
 
         self._foo = foo
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/list.py b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
index d58d13e90fb..e21a220f71c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/list.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/list.py
@@ -68,7 +68,7 @@ class List(object):
 
 
         :param _123_list: The _123_list of this List.  # noqa: E501
-        :type: str
+        :type _123_list: str
         """
 
         self.__123_list = _123_list
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
index f0cfba5073b..8afc875ce51 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/map_test.py
@@ -83,7 +83,7 @@ class MapTest(object):
 
 
         :param map_map_of_string: The map_map_of_string of this MapTest.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_of_string: dict(str, dict(str, str))
         """
 
         self._map_map_of_string = map_map_of_string
@@ -104,7 +104,7 @@ class MapTest(object):
 
 
         :param map_of_enum_string: The map_of_enum_string of this MapTest.  # noqa: E501
-        :type: dict(str, str)
+        :type map_of_enum_string: dict(str, str)
         """
         allowed_values = ["UPPER", "lower"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
@@ -133,7 +133,7 @@ class MapTest(object):
 
 
         :param direct_map: The direct_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type direct_map: dict(str, bool)
         """
 
         self._direct_map = direct_map
@@ -154,7 +154,7 @@ class MapTest(object):
 
 
         :param indirect_map: The indirect_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type indirect_map: dict(str, bool)
         """
 
         self._indirect_map = indirect_map
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 5da34f8830e..8aecbf0f558 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -78,7 +78,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -99,7 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -120,7 +120,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, Animal)
+        :type map: dict(str, Animal)
         """
 
         self._map = map
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
index 841ce1f18f3..3f4c4e2bd2a 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model200_response.py
@@ -73,7 +73,7 @@ class Model200Response(object):
 
 
         :param name: The name of this Model200Response.  # noqa: E501
-        :type: int
+        :type name: int
         """
 
         self._name = name
@@ -94,7 +94,7 @@ class Model200Response(object):
 
 
         :param _class: The _class of this Model200Response.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
index fdd8d72314a..1009c50ef08 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/model_return.py
@@ -68,7 +68,7 @@ class ModelReturn(object):
 
 
         :param _return: The _return of this ModelReturn.  # noqa: E501
-        :type: int
+        :type _return: int
         """
 
         self.__return = _return
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/name.py b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
index bb2c1fbd73c..6ee8261e782 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/name.py
@@ -82,7 +82,7 @@ class Name(object):
 
 
         :param name: The name of this Name.  # noqa: E501
-        :type: int
+        :type name: int
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -105,7 +105,7 @@ class Name(object):
 
 
         :param snake_case: The snake_case of this Name.  # noqa: E501
-        :type: int
+        :type snake_case: int
         """
 
         self._snake_case = snake_case
@@ -126,7 +126,7 @@ class Name(object):
 
 
         :param _property: The _property of this Name.  # noqa: E501
-        :type: str
+        :type _property: str
         """
 
         self.__property = _property
@@ -147,7 +147,7 @@ class Name(object):
 
 
         :param _123_number: The _123_number of this Name.  # noqa: E501
-        :type: int
+        :type _123_number: int
         """
 
         self.__123_number = _123_number
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
index 99b2424852f..90f09d8b7d5 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/number_only.py
@@ -68,7 +68,7 @@ class NumberOnly(object):
 
 
         :param just_number: The just_number of this NumberOnly.  # noqa: E501
-        :type: float
+        :type just_number: float
         """
 
         self._just_number = just_number
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/order.py b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
index 8c863cce8fe..8f298aa3d9c 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/order.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/order.py
@@ -93,7 +93,7 @@ class Order(object):
 
 
         :param id: The id of this Order.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -114,7 +114,7 @@ class Order(object):
 
 
         :param pet_id: The pet_id of this Order.  # noqa: E501
-        :type: int
+        :type pet_id: int
         """
 
         self._pet_id = pet_id
@@ -135,7 +135,7 @@ class Order(object):
 
 
         :param quantity: The quantity of this Order.  # noqa: E501
-        :type: int
+        :type quantity: int
         """
 
         self._quantity = quantity
@@ -156,7 +156,7 @@ class Order(object):
 
 
         :param ship_date: The ship_date of this Order.  # noqa: E501
-        :type: datetime
+        :type ship_date: datetime
         """
 
         self._ship_date = ship_date
@@ -179,7 +179,7 @@ class Order(object):
         Order Status  # noqa: E501
 
         :param status: The status of this Order.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["placed", "approved", "delivered"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
@@ -206,7 +206,7 @@ class Order(object):
 
 
         :param complete: The complete of this Order.  # noqa: E501
-        :type: bool
+        :type complete: bool
         """
 
         self._complete = complete
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
index c11859114a5..85fe36c7ef0 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/outer_composite.py
@@ -78,7 +78,7 @@ class OuterComposite(object):
 
 
         :param my_number: The my_number of this OuterComposite.  # noqa: E501
-        :type: float
+        :type my_number: float
         """
 
         self._my_number = my_number
@@ -99,7 +99,7 @@ class OuterComposite(object):
 
 
         :param my_string: The my_string of this OuterComposite.  # noqa: E501
-        :type: str
+        :type my_string: str
         """
 
         self._my_string = my_string
@@ -120,7 +120,7 @@ class OuterComposite(object):
 
 
         :param my_boolean: The my_boolean of this OuterComposite.  # noqa: E501
-        :type: bool
+        :type my_boolean: bool
         """
 
         self._my_boolean = my_boolean
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
index edbf73f5312..b948a6436db 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/pet.py
@@ -91,7 +91,7 @@ class Pet(object):
 
 
         :param id: The id of this Pet.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -112,7 +112,7 @@ class Pet(object):
 
 
         :param category: The category of this Pet.  # noqa: E501
-        :type: Category
+        :type category: Category
         """
 
         self._category = category
@@ -133,7 +133,7 @@ class Pet(object):
 
 
         :param name: The name of this Pet.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class Pet(object):
 
 
         :param photo_urls: The photo_urls of this Pet.  # noqa: E501
-        :type: list[str]
+        :type photo_urls: list[str]
         """
         if self.local_vars_configuration.client_side_validation and photo_urls is None:  # noqa: E501
             raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class Pet(object):
 
 
         :param tags: The tags of this Pet.  # noqa: E501
-        :type: list[Tag]
+        :type tags: list[Tag]
         """
 
         self._tags = tags
@@ -202,7 +202,7 @@ class Pet(object):
         pet status in the store  # noqa: E501
 
         :param status: The status of this Pet.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["available", "pending", "sold"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
index a84679e98de..3a305087dc2 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/read_only_first.py
@@ -73,7 +73,7 @@ class ReadOnlyFirst(object):
 
 
         :param bar: The bar of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class ReadOnlyFirst(object):
 
 
         :param baz: The baz of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type baz: str
         """
 
         self._baz = baz
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
index 396e75bcee5..d2535eb65ac 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/special_model_name.py
@@ -68,7 +68,7 @@ class SpecialModelName(object):
 
 
         :param special_property_name: The special_property_name of this SpecialModelName.  # noqa: E501
-        :type: int
+        :type special_property_name: int
         """
 
         self._special_property_name = special_property_name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
index d6137fdd47f..7492d30d9eb 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/tag.py
@@ -73,7 +73,7 @@ class Tag(object):
 
 
         :param id: The id of this Tag.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -94,7 +94,7 @@ class Tag(object):
 
 
         :param name: The name of this Tag.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_default.py b/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_default.py
index 8163ea77aa7..fbef6b4b157 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_default.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_default.py
@@ -83,7 +83,7 @@ class TypeHolderDefault(object):
 
 
         :param string_item: The string_item of this TypeHolderDefault.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -106,7 +106,7 @@ class TypeHolderDefault(object):
 
 
         :param number_item: The number_item of this TypeHolderDefault.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -129,7 +129,7 @@ class TypeHolderDefault(object):
 
 
         :param integer_item: The integer_item of this TypeHolderDefault.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -152,7 +152,7 @@ class TypeHolderDefault(object):
 
 
         :param bool_item: The bool_item of this TypeHolderDefault.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -175,7 +175,7 @@ class TypeHolderDefault(object):
 
 
         :param array_item: The array_item of this TypeHolderDefault.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_example.py b/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_example.py
index 34481fd21e3..b7320bed0ca 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_example.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/type_holder_example.py
@@ -87,7 +87,7 @@ class TypeHolderExample(object):
 
 
         :param string_item: The string_item of this TypeHolderExample.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -110,7 +110,7 @@ class TypeHolderExample(object):
 
 
         :param number_item: The number_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -133,7 +133,7 @@ class TypeHolderExample(object):
 
 
         :param float_item: The float_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type float_item: float
         """
         if self.local_vars_configuration.client_side_validation and float_item is None:  # noqa: E501
             raise ValueError("Invalid value for `float_item`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class TypeHolderExample(object):
 
 
         :param integer_item: The integer_item of this TypeHolderExample.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class TypeHolderExample(object):
 
 
         :param bool_item: The bool_item of this TypeHolderExample.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -202,7 +202,7 @@ class TypeHolderExample(object):
 
 
         :param array_item: The array_item of this TypeHolderExample.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/user.py b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
index de88bda4cde..0e25f9f1710 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/user.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/user.py
@@ -103,7 +103,7 @@ class User(object):
 
 
         :param id: The id of this User.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -124,7 +124,7 @@ class User(object):
 
 
         :param username: The username of this User.  # noqa: E501
-        :type: str
+        :type username: str
         """
 
         self._username = username
@@ -145,7 +145,7 @@ class User(object):
 
 
         :param first_name: The first_name of this User.  # noqa: E501
-        :type: str
+        :type first_name: str
         """
 
         self._first_name = first_name
@@ -166,7 +166,7 @@ class User(object):
 
 
         :param last_name: The last_name of this User.  # noqa: E501
-        :type: str
+        :type last_name: str
         """
 
         self._last_name = last_name
@@ -187,7 +187,7 @@ class User(object):
 
 
         :param email: The email of this User.  # noqa: E501
-        :type: str
+        :type email: str
         """
 
         self._email = email
@@ -208,7 +208,7 @@ class User(object):
 
 
         :param password: The password of this User.  # noqa: E501
-        :type: str
+        :type password: str
         """
 
         self._password = password
@@ -229,7 +229,7 @@ class User(object):
 
 
         :param phone: The phone of this User.  # noqa: E501
-        :type: str
+        :type phone: str
         """
 
         self._phone = phone
@@ -252,7 +252,7 @@ class User(object):
         User Status  # noqa: E501
 
         :param user_status: The user_status of this User.  # noqa: E501
-        :type: int
+        :type user_status: int
         """
 
         self._user_status = user_status
diff --git a/samples/client/petstore/python-asyncio/petstore_api/models/xml_item.py b/samples/client/petstore/python-asyncio/petstore_api/models/xml_item.py
index 52ecc9aa522..afb75967cb0 100644
--- a/samples/client/petstore/python-asyncio/petstore_api/models/xml_item.py
+++ b/samples/client/petstore/python-asyncio/petstore_api/models/xml_item.py
@@ -208,7 +208,7 @@ class XmlItem(object):
 
 
         :param attribute_string: The attribute_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type attribute_string: str
         """
 
         self._attribute_string = attribute_string
@@ -229,7 +229,7 @@ class XmlItem(object):
 
 
         :param attribute_number: The attribute_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type attribute_number: float
         """
 
         self._attribute_number = attribute_number
@@ -250,7 +250,7 @@ class XmlItem(object):
 
 
         :param attribute_integer: The attribute_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type attribute_integer: int
         """
 
         self._attribute_integer = attribute_integer
@@ -271,7 +271,7 @@ class XmlItem(object):
 
 
         :param attribute_boolean: The attribute_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type attribute_boolean: bool
         """
 
         self._attribute_boolean = attribute_boolean
@@ -292,7 +292,7 @@ class XmlItem(object):
 
 
         :param wrapped_array: The wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type wrapped_array: list[int]
         """
 
         self._wrapped_array = wrapped_array
@@ -313,7 +313,7 @@ class XmlItem(object):
 
 
         :param name_string: The name_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type name_string: str
         """
 
         self._name_string = name_string
@@ -334,7 +334,7 @@ class XmlItem(object):
 
 
         :param name_number: The name_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type name_number: float
         """
 
         self._name_number = name_number
@@ -355,7 +355,7 @@ class XmlItem(object):
 
 
         :param name_integer: The name_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type name_integer: int
         """
 
         self._name_integer = name_integer
@@ -376,7 +376,7 @@ class XmlItem(object):
 
 
         :param name_boolean: The name_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type name_boolean: bool
         """
 
         self._name_boolean = name_boolean
@@ -397,7 +397,7 @@ class XmlItem(object):
 
 
         :param name_array: The name_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_array: list[int]
         """
 
         self._name_array = name_array
@@ -418,7 +418,7 @@ class XmlItem(object):
 
 
         :param name_wrapped_array: The name_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_wrapped_array: list[int]
         """
 
         self._name_wrapped_array = name_wrapped_array
@@ -439,7 +439,7 @@ class XmlItem(object):
 
 
         :param prefix_string: The prefix_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_string: str
         """
 
         self._prefix_string = prefix_string
@@ -460,7 +460,7 @@ class XmlItem(object):
 
 
         :param prefix_number: The prefix_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_number: float
         """
 
         self._prefix_number = prefix_number
@@ -481,7 +481,7 @@ class XmlItem(object):
 
 
         :param prefix_integer: The prefix_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_integer: int
         """
 
         self._prefix_integer = prefix_integer
@@ -502,7 +502,7 @@ class XmlItem(object):
 
 
         :param prefix_boolean: The prefix_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_boolean: bool
         """
 
         self._prefix_boolean = prefix_boolean
@@ -523,7 +523,7 @@ class XmlItem(object):
 
 
         :param prefix_array: The prefix_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_array: list[int]
         """
 
         self._prefix_array = prefix_array
@@ -544,7 +544,7 @@ class XmlItem(object):
 
 
         :param prefix_wrapped_array: The prefix_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_wrapped_array: list[int]
         """
 
         self._prefix_wrapped_array = prefix_wrapped_array
@@ -565,7 +565,7 @@ class XmlItem(object):
 
 
         :param namespace_string: The namespace_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type namespace_string: str
         """
 
         self._namespace_string = namespace_string
@@ -586,7 +586,7 @@ class XmlItem(object):
 
 
         :param namespace_number: The namespace_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type namespace_number: float
         """
 
         self._namespace_number = namespace_number
@@ -607,7 +607,7 @@ class XmlItem(object):
 
 
         :param namespace_integer: The namespace_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type namespace_integer: int
         """
 
         self._namespace_integer = namespace_integer
@@ -628,7 +628,7 @@ class XmlItem(object):
 
 
         :param namespace_boolean: The namespace_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type namespace_boolean: bool
         """
 
         self._namespace_boolean = namespace_boolean
@@ -649,7 +649,7 @@ class XmlItem(object):
 
 
         :param namespace_array: The namespace_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_array: list[int]
         """
 
         self._namespace_array = namespace_array
@@ -670,7 +670,7 @@ class XmlItem(object):
 
 
         :param namespace_wrapped_array: The namespace_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_wrapped_array: list[int]
         """
 
         self._namespace_wrapped_array = namespace_wrapped_array
@@ -691,7 +691,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_string: The prefix_ns_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_ns_string: str
         """
 
         self._prefix_ns_string = prefix_ns_string
@@ -712,7 +712,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_number: The prefix_ns_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_ns_number: float
         """
 
         self._prefix_ns_number = prefix_ns_number
@@ -733,7 +733,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_integer: The prefix_ns_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_ns_integer: int
         """
 
         self._prefix_ns_integer = prefix_ns_integer
@@ -754,7 +754,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_boolean: The prefix_ns_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_ns_boolean: bool
         """
 
         self._prefix_ns_boolean = prefix_ns_boolean
@@ -775,7 +775,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_array: The prefix_ns_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_array: list[int]
         """
 
         self._prefix_ns_array = prefix_ns_array
@@ -796,7 +796,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_wrapped_array: The prefix_ns_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_wrapped_array: list[int]
         """
 
         self._prefix_ns_wrapped_array = prefix_ns_wrapped_array
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
index 3f277311b8f..49f60348997 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
@@ -59,6 +59,7 @@ class AnotherFakeApi(object):
             To test special tags and operation ID starting with number  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.call_123_test_special_tags(body, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
index a05c8e947b3..3f2e1ae4bd9 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/fake_api.py
@@ -65,6 +65,7 @@ class FakeApi(object):
             this route creates an XmlItem  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_xml_item(xml_item, async_req=True)
             >>> result = thread.get()
 
@@ -184,6 +185,7 @@ class FakeApi(object):
             Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -293,6 +295,7 @@ class FakeApi(object):
             Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -402,6 +405,7 @@ class FakeApi(object):
             Test serialization of outer enum  # 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_outer_enum_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -511,6 +515,7 @@ class FakeApi(object):
             Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -620,6 +625,7 @@ class FakeApi(object):
             Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -730,6 +736,7 @@ class FakeApi(object):
             For this test, the body for this request much reference a schema named `File`.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_body_with_file_schema(body, async_req=True)
             >>> result = thread.get()
 
@@ -845,6 +852,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_body_with_query_params(query, body, async_req=True)
             >>> result = thread.get()
 
@@ -969,6 +977,7 @@ class FakeApi(object):
             To test \"client\" model  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_client_model(body, async_req=True)
             >>> result = thread.get()
 
@@ -1090,6 +1099,7 @@ class FakeApi(object):
             This route has required values with enums of 1  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_endpoint_enums_length_one(query_integer=3, query_string='brillig', path_string='hello', path_integer=34, header_number=1.234, async_req=True)
             >>> result = thread.get()
 
@@ -1268,6 +1278,7 @@ class FakeApi(object):
             Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
             >>> result = thread.get()
 
@@ -1521,6 +1532,7 @@ class FakeApi(object):
             To test enum parameters  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_enum_parameters(async_req=True)
             >>> result = thread.get()
 
@@ -1730,6 +1742,7 @@ class FakeApi(object):
             Fake endpoint to test group parameters (optional)  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
             >>> result = thread.get()
 
@@ -1879,6 +1892,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_inline_additional_properties(param, async_req=True)
             >>> result = thread.get()
 
@@ -1994,6 +2008,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_json_form_data(param, param2, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
index be57432ae68..22b66a6a6c0 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
@@ -59,6 +59,7 @@ class FakeClassnameTags123Api(object):
             To test class name in snake case  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_classname(body, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py b/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
index 6ec1e6d5c5c..d917cb3cd67 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/pet_api.py
@@ -59,6 +59,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.add_pet(body, async_req=True)
             >>> result = thread.get()
 
@@ -176,6 +177,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_pet(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -298,6 +300,7 @@ class PetApi(object):
             Multiple status values can be provided with comma separated strings  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.find_pets_by_status(status, async_req=True)
             >>> result = thread.get()
 
@@ -425,6 +428,7 @@ class PetApi(object):
             Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.find_pets_by_tags(tags, async_req=True)
             >>> result = thread.get()
 
@@ -545,6 +549,7 @@ class PetApi(object):
             Returns a single pet  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_pet_by_id(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -663,6 +668,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_pet(body, async_req=True)
             >>> result = thread.get()
 
@@ -780,6 +786,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_pet_with_form(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -909,6 +916,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.upload_file(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -1048,6 +1056,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/store_api.py b/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
index e612a43704f..bd4c0e0a25e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/store_api.py
@@ -59,6 +59,7 @@ class StoreApi(object):
             For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_order(order_id, async_req=True)
             >>> result = thread.get()
 
@@ -172,6 +173,7 @@ class StoreApi(object):
             Returns a map of status codes to quantities  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_inventory(async_req=True)
             >>> result = thread.get()
 
@@ -279,6 +281,7 @@ class StoreApi(object):
             For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_order_by_id(order_id, async_req=True)
             >>> result = thread.get()
 
@@ -401,6 +404,7 @@ class StoreApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.place_order(body, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api/user_api.py b/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
index 930ae821f2c..f313a230354 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api/user_api.py
@@ -59,6 +59,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_user(body, async_req=True)
             >>> result = thread.get()
 
@@ -171,6 +172,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_users_with_array_input(body, async_req=True)
             >>> result = thread.get()
 
@@ -283,6 +285,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_users_with_list_input(body, async_req=True)
             >>> result = thread.get()
 
@@ -396,6 +399,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_user(username, async_req=True)
             >>> result = thread.get()
 
@@ -509,6 +513,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_user_by_name(username, async_req=True)
             >>> result = thread.get()
 
@@ -626,6 +631,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.login_user(username, password, async_req=True)
             >>> result = thread.get()
 
@@ -750,6 +756,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.logout_user(async_req=True)
             >>> result = thread.get()
 
@@ -854,6 +861,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_user(username, body, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/client/petstore/python-experimental/petstore_api/api_client.py b/samples/client/petstore/python-experimental/petstore_api/api_client.py
index 39833326818..58430c7459e 100644
--- a/samples/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/client/petstore/python-experimental/petstore_api/api_client.py
@@ -279,6 +279,7 @@ class ApiClient(object):
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
         :param _check_type: boolean, whether to check the types of the data
             received from the server
+        :type _check_type: bool
 
         :return: deserialized object.
         """
@@ -338,22 +339,28 @@ class ApiClient(object):
             (float, none_type)
             ([int, none_type],)
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
-        :param files dict: key -> field name, value -> a list of open file
+        :param files: key -> field name, value -> a list of open file
             objects for `multipart/form-data`.
+        :type files: dict
         :param async_req bool: execute 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 collection_formats: dict of collection formats for path, query,
             header, and post parameters.
+        :type collection_formats: dict, 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 _check_type: boolean describing if the data back from the server
             should have its type checked.
+        :type _check_type: bool, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -547,9 +554,9 @@ class ApiClient(object):
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
-        :resource_path: A string representation of the HTTP request resource path.
-        :method: A string representation of the HTTP request method.
-        :body: A object representing the body of the HTTP request.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
             The object type is the return value of sanitize_for_serialization().
         """
         if not auth_settings:
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
index 77c4c003fe4..4d69b287ca8 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/another_fake_api.py
@@ -42,21 +42,26 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.call_123_test_special_tags_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
index 667c50612ce..e1d9ffebebf 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_api.py
@@ -42,21 +42,26 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_xml_item_with_http_info(xml_item, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -156,21 +167,26 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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: bool
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: bool
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_boolean_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -181,23 +197,29 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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.
-        :return: tuple(bool, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(bool, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -266,21 +288,26 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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: OuterComposite
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: OuterComposite
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_composite_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -291,23 +318,29 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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.
-        :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -376,21 +409,26 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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: float
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: float
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_number_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -401,23 +439,29 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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.
-        :return: tuple(float, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(float, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -486,21 +530,26 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_string_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -511,23 +560,29 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -596,21 +651,26 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_file_schema_with_http_info(body, **kwargs)  # noqa: E501
@@ -621,23 +681,29 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -709,22 +775,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_query_params_with_http_info(query, body, **kwargs)  # noqa: E501
@@ -734,24 +806,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -831,21 +910,26 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_client_model_with_http_info(body, **kwargs)  # noqa: E501
@@ -856,23 +940,29 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -949,34 +1039,52 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs)  # noqa: E501
@@ -987,36 +1095,55 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1168,28 +1295,40 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_enum_parameters_with_http_info(**kwargs)  # noqa: E501
@@ -1200,30 +1339,43 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1316,26 +1468,36 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs)  # noqa: E501
@@ -1346,28 +1508,39 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1458,21 +1631,26 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_inline_additional_properties_with_http_info(param, **kwargs)  # noqa: E501
@@ -1482,23 +1660,29 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1570,22 +1754,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_json_form_data_with_http_info(param, param2, **kwargs)  # noqa: E501
@@ -1595,24 +1785,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1692,25 +1889,34 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, **kwargs)  # noqa: E501
@@ -1721,27 +1927,37 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
index 2bb189bd01b..d963591a49a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/fake_classname_tags_123_api.py
@@ -42,21 +42,26 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_classname_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
index 5a297a57647..7002fe32740 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/pet_api.py
@@ -41,21 +41,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.add_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -65,23 +70,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -153,22 +164,28 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_pet_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -178,24 +195,31 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -267,21 +291,26 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_status_with_http_info(status, **kwargs)  # noqa: E501
@@ -292,23 +321,29 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -382,21 +417,26 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_tags_with_http_info(tags, **kwargs)  # noqa: E501
@@ -407,23 +447,29 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -497,21 +543,26 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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: Pet
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Pet
         """
         kwargs['_return_http_data_only'] = True
         return self.get_pet_by_id_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -522,23 +573,29 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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.
-        :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -610,21 +667,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -634,23 +696,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -722,23 +790,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_form_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -748,25 +823,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -844,23 +927,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -870,25 +960,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -970,23 +1068,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs)  # noqa: E501
@@ -996,25 +1101,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
index f693f755b74..0ede23f05ba 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/store_api.py
@@ -42,21 +42,26 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_order_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -152,20 +163,24 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: dict(str, int)
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: dict(str, int)
         """
         kwargs['_return_http_data_only'] = True
         return self.get_inventory_with_http_info(**kwargs)  # noqa: E501
@@ -176,22 +191,27 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -257,21 +277,26 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.get_order_by_id_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -282,23 +307,29 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -374,21 +405,26 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.place_order_with_http_info(body, **kwargs)  # noqa: E501
@@ -398,23 +434,29 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
index 9462f00716a..a912483b023 100644
--- a/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python-tornado/petstore_api/api/user_api.py
@@ -42,21 +42,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_user_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -151,21 +162,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_array_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -175,23 +191,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -259,21 +281,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_list_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -283,23 +310,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -368,21 +401,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_user_with_http_info(username, **kwargs)  # noqa: E501
@@ -393,23 +431,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -477,21 +521,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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: User
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: User
         """
         kwargs['_return_http_data_only'] = True
         return self.get_user_by_name_with_http_info(username, **kwargs)  # noqa: E501
@@ -501,23 +550,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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.
-        :return: tuple(User, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(User, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -589,22 +644,28 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.login_user_with_http_info(username, password, **kwargs)  # noqa: E501
@@ -614,24 +675,31 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user_with_http_info(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -710,20 +778,24 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.logout_user_with_http_info(**kwargs)  # noqa: E501
@@ -733,22 +805,27 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -810,22 +887,28 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_user_with_http_info(username, body, **kwargs)  # noqa: E501
@@ -836,24 +919,31 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user_with_http_info(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_any_type.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_any_type.py
index 2954285de87..690c71705b9 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_any_type.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_any_type.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesAnyType(object):
 
 
         :param name: The name of this AdditionalPropertiesAnyType.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_array.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_array.py
index c6369c22a12..f0902bdaffa 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_array.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_array.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesArray(object):
 
 
         :param name: The name of this AdditionalPropertiesArray.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_boolean.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_boolean.py
index 599b7c8b884..f79d2609a1d 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_boolean.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_boolean.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesBoolean(object):
 
 
         :param name: The name of this AdditionalPropertiesBoolean.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
index be4455c683b..ca334635175 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_class.py
@@ -118,7 +118,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_string: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, str)
+        :type map_string: dict(str, str)
         """
 
         self._map_string = map_string
@@ -139,7 +139,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_number: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, float)
+        :type map_number: dict(str, float)
         """
 
         self._map_number = map_number
@@ -160,7 +160,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_integer: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, int)
+        :type map_integer: dict(str, int)
         """
 
         self._map_integer = map_integer
@@ -181,7 +181,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_boolean: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, bool)
+        :type map_boolean: dict(str, bool)
         """
 
         self._map_boolean = map_boolean
@@ -202,7 +202,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_integer: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[int])
+        :type map_array_integer: dict(str, list[int])
         """
 
         self._map_array_integer = map_array_integer
@@ -223,7 +223,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_anytype: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[object])
+        :type map_array_anytype: dict(str, list[object])
         """
 
         self._map_array_anytype = map_array_anytype
@@ -244,7 +244,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_string: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_string: dict(str, dict(str, str))
         """
 
         self._map_map_string = map_map_string
@@ -265,7 +265,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_anytype: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, object))
+        :type map_map_anytype: dict(str, dict(str, object))
         """
 
         self._map_map_anytype = map_map_anytype
@@ -286,7 +286,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_1: The anytype_1 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_1: object
         """
 
         self._anytype_1 = anytype_1
@@ -307,7 +307,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_2: The anytype_2 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_2: object
         """
 
         self._anytype_2 = anytype_2
@@ -328,7 +328,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_3: The anytype_3 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_3: object
         """
 
         self._anytype_3 = anytype_3
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_integer.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_integer.py
index ddbb85fdf33..5c3ebf230d1 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_integer.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_integer.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesInteger(object):
 
 
         :param name: The name of this AdditionalPropertiesInteger.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_number.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_number.py
index 8bbeda83ecc..0e7f34ed329 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_number.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_number.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesNumber(object):
 
 
         :param name: The name of this AdditionalPropertiesNumber.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_object.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_object.py
index af87595b3e4..5a8ea94b929 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_object.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_object.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesObject(object):
 
 
         :param name: The name of this AdditionalPropertiesObject.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_string.py b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_string.py
index 6ab2c91feda..8436a1e345b 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_string.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/additional_properties_string.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesString(object):
 
 
         :param name: The name of this AdditionalPropertiesString.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/animal.py b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
index b338e0eb18e..eef35ab093a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/animal.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/animal.py
@@ -78,7 +78,7 @@ class Animal(object):
 
 
         :param class_name: The class_name of this Animal.  # noqa: E501
-        :type: str
+        :type class_name: str
         """
         if self.local_vars_configuration.client_side_validation and class_name is None:  # noqa: E501
             raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
@@ -101,7 +101,7 @@ class Animal(object):
 
 
         :param color: The color of this Animal.  # noqa: E501
-        :type: str
+        :type color: str
         """
 
         self._color = color
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
index 24e80d02aea..8cb64673c35 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/api_response.py
@@ -78,7 +78,7 @@ class ApiResponse(object):
 
 
         :param code: The code of this ApiResponse.  # noqa: E501
-        :type: int
+        :type code: int
         """
 
         self._code = code
@@ -99,7 +99,7 @@ class ApiResponse(object):
 
 
         :param type: The type of this ApiResponse.  # noqa: E501
-        :type: str
+        :type type: str
         """
 
         self._type = type
@@ -120,7 +120,7 @@ class ApiResponse(object):
 
 
         :param message: The message of this ApiResponse.  # noqa: E501
-        :type: str
+        :type message: str
         """
 
         self._message = message
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
index 1f654452077..41a689c534a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfArrayOfNumberOnly(object):
 
 
         :param array_array_number: The array_array_number of this ArrayOfArrayOfNumberOnly.  # noqa: E501
-        :type: list[list[float]]
+        :type array_array_number: list[list[float]]
         """
 
         self._array_array_number = array_array_number
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
index 27ba1f58e31..ddb7f7c7abe 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfNumberOnly(object):
 
 
         :param array_number: The array_number of this ArrayOfNumberOnly.  # noqa: E501
-        :type: list[float]
+        :type array_number: list[float]
         """
 
         self._array_number = array_number
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
index f34a372f6f3..e8e5c378f98 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/array_test.py
@@ -78,7 +78,7 @@ class ArrayTest(object):
 
 
         :param array_of_string: The array_of_string of this ArrayTest.  # noqa: E501
-        :type: list[str]
+        :type array_of_string: list[str]
         """
 
         self._array_of_string = array_of_string
@@ -99,7 +99,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_integer: The array_array_of_integer of this ArrayTest.  # noqa: E501
-        :type: list[list[int]]
+        :type array_array_of_integer: list[list[int]]
         """
 
         self._array_array_of_integer = array_array_of_integer
@@ -120,7 +120,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_model: The array_array_of_model of this ArrayTest.  # noqa: E501
-        :type: list[list[ReadOnlyFirst]]
+        :type array_array_of_model: list[list[ReadOnlyFirst]]
         """
 
         self._array_array_of_model = array_array_of_model
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/big_cat.py b/samples/client/petstore/python-tornado/petstore_api/models/big_cat.py
index fe52c3650ac..946981f5b7f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/big_cat.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/big_cat.py
@@ -68,7 +68,7 @@ class BigCat(object):
 
 
         :param kind: The kind of this BigCat.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/big_cat_all_of.py b/samples/client/petstore/python-tornado/petstore_api/models/big_cat_all_of.py
index b75500db987..41c205d2576 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/big_cat_all_of.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/big_cat_all_of.py
@@ -68,7 +68,7 @@ class BigCatAllOf(object):
 
 
         :param kind: The kind of this BigCatAllOf.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
index cef34c5f6dc..967d324a0ab 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/capitalization.py
@@ -93,7 +93,7 @@ class Capitalization(object):
 
 
         :param small_camel: The small_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_camel: str
         """
 
         self._small_camel = small_camel
@@ -114,7 +114,7 @@ class Capitalization(object):
 
 
         :param capital_camel: The capital_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_camel: str
         """
 
         self._capital_camel = capital_camel
@@ -135,7 +135,7 @@ class Capitalization(object):
 
 
         :param small_snake: The small_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_snake: str
         """
 
         self._small_snake = small_snake
@@ -156,7 +156,7 @@ class Capitalization(object):
 
 
         :param capital_snake: The capital_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_snake: str
         """
 
         self._capital_snake = capital_snake
@@ -177,7 +177,7 @@ class Capitalization(object):
 
 
         :param sca_eth_flow_points: The sca_eth_flow_points of this Capitalization.  # noqa: E501
-        :type: str
+        :type sca_eth_flow_points: str
         """
 
         self._sca_eth_flow_points = sca_eth_flow_points
@@ -200,7 +200,7 @@ class Capitalization(object):
         Name of the pet   # noqa: E501
 
         :param att_name: The att_name of this Capitalization.  # noqa: E501
-        :type: str
+        :type att_name: str
         """
 
         self._att_name = att_name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/cat.py b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
index e39c1c82508..b3b0d868c7f 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/cat.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/cat.py
@@ -68,7 +68,7 @@ class Cat(object):
 
 
         :param declawed: The declawed of this Cat.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/cat_all_of.py b/samples/client/petstore/python-tornado/petstore_api/models/cat_all_of.py
index 7e90fab9348..f573a04636c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/cat_all_of.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/cat_all_of.py
@@ -68,7 +68,7 @@ class CatAllOf(object):
 
 
         :param declawed: The declawed of this CatAllOf.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/category.py b/samples/client/petstore/python-tornado/petstore_api/models/category.py
index b47c148953e..11a7bf85f3a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/category.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/category.py
@@ -72,7 +72,7 @@ class Category(object):
 
 
         :param id: The id of this Category.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -93,7 +93,7 @@ class Category(object):
 
 
         :param name: The name of this Category.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
index ef6060ffa70..aac505ea064 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/class_model.py
@@ -68,7 +68,7 @@ class ClassModel(object):
 
 
         :param _class: The _class of this ClassModel.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/client.py b/samples/client/petstore/python-tornado/petstore_api/models/client.py
index ee5dbf1c43a..2006350b210 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/client.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/client.py
@@ -68,7 +68,7 @@ class Client(object):
 
 
         :param client: The client of this Client.  # noqa: E501
-        :type: str
+        :type client: str
         """
 
         self._client = client
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/dog.py b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
index eacb63eedb0..fb9024d0bb7 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/dog.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/dog.py
@@ -68,7 +68,7 @@ class Dog(object):
 
 
         :param breed: The breed of this Dog.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/dog_all_of.py b/samples/client/petstore/python-tornado/petstore_api/models/dog_all_of.py
index 48e04855708..5943ba900dd 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/dog_all_of.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/dog_all_of.py
@@ -68,7 +68,7 @@ class DogAllOf(object):
 
 
         :param breed: The breed of this DogAllOf.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
index 819ff322157..ae2ea1d4251 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_arrays.py
@@ -73,7 +73,7 @@ class EnumArrays(object):
 
 
         :param just_symbol: The just_symbol of this EnumArrays.  # noqa: E501
-        :type: str
+        :type just_symbol: str
         """
         allowed_values = [">=", "$"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and just_symbol not in allowed_values:  # noqa: E501
@@ -100,7 +100,7 @@ class EnumArrays(object):
 
 
         :param array_enum: The array_enum of this EnumArrays.  # noqa: E501
-        :type: list[str]
+        :type array_enum: list[str]
         """
         allowed_values = ["fish", "crab"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
index 464281b3ec0..e9872c4d005 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/enum_test.py
@@ -87,7 +87,7 @@ class EnumTest(object):
 
 
         :param enum_string: The enum_string of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string: str
         """
         allowed_values = ["UPPER", "lower", ""]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_string not in allowed_values:  # noqa: E501
@@ -114,7 +114,7 @@ class EnumTest(object):
 
 
         :param enum_string_required: The enum_string_required of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string_required: str
         """
         if self.local_vars_configuration.client_side_validation and enum_string_required is None:  # noqa: E501
             raise ValueError("Invalid value for `enum_string_required`, must not be `None`")  # noqa: E501
@@ -143,7 +143,7 @@ class EnumTest(object):
 
 
         :param enum_integer: The enum_integer of this EnumTest.  # noqa: E501
-        :type: int
+        :type enum_integer: int
         """
         allowed_values = [1, -1]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_integer not in allowed_values:  # noqa: E501
@@ -170,7 +170,7 @@ class EnumTest(object):
 
 
         :param enum_number: The enum_number of this EnumTest.  # noqa: E501
-        :type: float
+        :type enum_number: float
         """
         allowed_values = [1.1, -1.2]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_number not in allowed_values:  # noqa: E501
@@ -197,7 +197,7 @@ class EnumTest(object):
 
 
         :param outer_enum: The outer_enum of this EnumTest.  # noqa: E501
-        :type: OuterEnum
+        :type outer_enum: OuterEnum
         """
 
         self._outer_enum = outer_enum
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/file.py b/samples/client/petstore/python-tornado/petstore_api/models/file.py
index 282df2957e6..4fb5c31762e 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/file.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/file.py
@@ -70,7 +70,7 @@ class File(object):
         Test capitalization  # noqa: E501
 
         :param source_uri: The source_uri of this File.  # noqa: E501
-        :type: str
+        :type source_uri: str
         """
 
         self._source_uri = source_uri
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/file_schema_test_class.py b/samples/client/petstore/python-tornado/petstore_api/models/file_schema_test_class.py
index de7f865b47e..2f2d44a7b33 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/file_schema_test_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/file_schema_test_class.py
@@ -73,7 +73,7 @@ class FileSchemaTestClass(object):
 
 
         :param file: The file of this FileSchemaTestClass.  # noqa: E501
-        :type: File
+        :type file: File
         """
 
         self._file = file
@@ -94,7 +94,7 @@ class FileSchemaTestClass(object):
 
 
         :param files: The files of this FileSchemaTestClass.  # noqa: E501
-        :type: list[File]
+        :type files: list[File]
         """
 
         self._files = files
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
index 6396c442f62..c96f8132fa6 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/format_test.py
@@ -129,7 +129,7 @@ class FormatTest(object):
 
 
         :param integer: The integer of this FormatTest.  # noqa: E501
-        :type: int
+        :type integer: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 integer is not None and integer > 100):  # noqa: E501
@@ -156,7 +156,7 @@ class FormatTest(object):
 
 
         :param int32: The int32 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int32: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 int32 is not None and int32 > 200):  # noqa: E501
@@ -183,7 +183,7 @@ class FormatTest(object):
 
 
         :param int64: The int64 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int64: int
         """
 
         self._int64 = int64
@@ -204,7 +204,7 @@ class FormatTest(object):
 
 
         :param number: The number of this FormatTest.  # noqa: E501
-        :type: float
+        :type number: float
         """
         if self.local_vars_configuration.client_side_validation and number is None:  # noqa: E501
             raise ValueError("Invalid value for `number`, must not be `None`")  # noqa: E501
@@ -233,7 +233,7 @@ class FormatTest(object):
 
 
         :param float: The float of this FormatTest.  # noqa: E501
-        :type: float
+        :type float: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 float is not None and float > 987.6):  # noqa: E501
@@ -260,7 +260,7 @@ class FormatTest(object):
 
 
         :param double: The double of this FormatTest.  # noqa: E501
-        :type: float
+        :type double: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 double is not None and double > 123.4):  # noqa: E501
@@ -287,7 +287,7 @@ class FormatTest(object):
 
 
         :param string: The string of this FormatTest.  # noqa: E501
-        :type: str
+        :type string: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 string is not None and not re.search(r'[a-z]', string, flags=re.IGNORECASE)):  # noqa: E501
@@ -311,7 +311,7 @@ class FormatTest(object):
 
 
         :param byte: The byte of this FormatTest.  # noqa: E501
-        :type: str
+        :type byte: str
         """
         if self.local_vars_configuration.client_side_validation and byte is None:  # noqa: E501
             raise ValueError("Invalid value for `byte`, must not be `None`")  # noqa: E501
@@ -337,7 +337,7 @@ class FormatTest(object):
 
 
         :param binary: The binary of this FormatTest.  # noqa: E501
-        :type: file
+        :type binary: file
         """
 
         self._binary = binary
@@ -358,7 +358,7 @@ class FormatTest(object):
 
 
         :param date: The date of this FormatTest.  # noqa: E501
-        :type: date
+        :type date: date
         """
         if self.local_vars_configuration.client_side_validation and date is None:  # noqa: E501
             raise ValueError("Invalid value for `date`, must not be `None`")  # noqa: E501
@@ -381,7 +381,7 @@ class FormatTest(object):
 
 
         :param date_time: The date_time of this FormatTest.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -402,7 +402,7 @@ class FormatTest(object):
 
 
         :param uuid: The uuid of this FormatTest.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -423,7 +423,7 @@ class FormatTest(object):
 
 
         :param password: The password of this FormatTest.  # noqa: E501
-        :type: str
+        :type password: str
         """
         if self.local_vars_configuration.client_side_validation and password is None:  # noqa: E501
             raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
@@ -452,7 +452,7 @@ class FormatTest(object):
 
 
         :param big_decimal: The big_decimal of this FormatTest.  # noqa: E501
-        :type: BigDecimal
+        :type big_decimal: BigDecimal
         """
 
         self._big_decimal = big_decimal
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
index 5fc2f8a9ebd..fa496519ecb 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/has_only_read_only.py
@@ -73,7 +73,7 @@ class HasOnlyReadOnly(object):
 
 
         :param bar: The bar of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class HasOnlyReadOnly(object):
 
 
         :param foo: The foo of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type foo: str
         """
 
         self._foo = foo
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/list.py b/samples/client/petstore/python-tornado/petstore_api/models/list.py
index d58d13e90fb..e21a220f71c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/list.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/list.py
@@ -68,7 +68,7 @@ class List(object):
 
 
         :param _123_list: The _123_list of this List.  # noqa: E501
-        :type: str
+        :type _123_list: str
         """
 
         self.__123_list = _123_list
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
index f0cfba5073b..8afc875ce51 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/map_test.py
@@ -83,7 +83,7 @@ class MapTest(object):
 
 
         :param map_map_of_string: The map_map_of_string of this MapTest.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_of_string: dict(str, dict(str, str))
         """
 
         self._map_map_of_string = map_map_of_string
@@ -104,7 +104,7 @@ class MapTest(object):
 
 
         :param map_of_enum_string: The map_of_enum_string of this MapTest.  # noqa: E501
-        :type: dict(str, str)
+        :type map_of_enum_string: dict(str, str)
         """
         allowed_values = ["UPPER", "lower"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
@@ -133,7 +133,7 @@ class MapTest(object):
 
 
         :param direct_map: The direct_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type direct_map: dict(str, bool)
         """
 
         self._direct_map = direct_map
@@ -154,7 +154,7 @@ class MapTest(object):
 
 
         :param indirect_map: The indirect_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type indirect_map: dict(str, bool)
         """
 
         self._indirect_map = indirect_map
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 5da34f8830e..8aecbf0f558 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -78,7 +78,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -99,7 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -120,7 +120,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, Animal)
+        :type map: dict(str, Animal)
         """
 
         self._map = map
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
index 841ce1f18f3..3f4c4e2bd2a 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model200_response.py
@@ -73,7 +73,7 @@ class Model200Response(object):
 
 
         :param name: The name of this Model200Response.  # noqa: E501
-        :type: int
+        :type name: int
         """
 
         self._name = name
@@ -94,7 +94,7 @@ class Model200Response(object):
 
 
         :param _class: The _class of this Model200Response.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
index fdd8d72314a..1009c50ef08 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/model_return.py
@@ -68,7 +68,7 @@ class ModelReturn(object):
 
 
         :param _return: The _return of this ModelReturn.  # noqa: E501
-        :type: int
+        :type _return: int
         """
 
         self.__return = _return
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/name.py b/samples/client/petstore/python-tornado/petstore_api/models/name.py
index bb2c1fbd73c..6ee8261e782 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/name.py
@@ -82,7 +82,7 @@ class Name(object):
 
 
         :param name: The name of this Name.  # noqa: E501
-        :type: int
+        :type name: int
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -105,7 +105,7 @@ class Name(object):
 
 
         :param snake_case: The snake_case of this Name.  # noqa: E501
-        :type: int
+        :type snake_case: int
         """
 
         self._snake_case = snake_case
@@ -126,7 +126,7 @@ class Name(object):
 
 
         :param _property: The _property of this Name.  # noqa: E501
-        :type: str
+        :type _property: str
         """
 
         self.__property = _property
@@ -147,7 +147,7 @@ class Name(object):
 
 
         :param _123_number: The _123_number of this Name.  # noqa: E501
-        :type: int
+        :type _123_number: int
         """
 
         self.__123_number = _123_number
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
index 99b2424852f..90f09d8b7d5 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/number_only.py
@@ -68,7 +68,7 @@ class NumberOnly(object):
 
 
         :param just_number: The just_number of this NumberOnly.  # noqa: E501
-        :type: float
+        :type just_number: float
         """
 
         self._just_number = just_number
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/order.py b/samples/client/petstore/python-tornado/petstore_api/models/order.py
index 8c863cce8fe..8f298aa3d9c 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/order.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/order.py
@@ -93,7 +93,7 @@ class Order(object):
 
 
         :param id: The id of this Order.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -114,7 +114,7 @@ class Order(object):
 
 
         :param pet_id: The pet_id of this Order.  # noqa: E501
-        :type: int
+        :type pet_id: int
         """
 
         self._pet_id = pet_id
@@ -135,7 +135,7 @@ class Order(object):
 
 
         :param quantity: The quantity of this Order.  # noqa: E501
-        :type: int
+        :type quantity: int
         """
 
         self._quantity = quantity
@@ -156,7 +156,7 @@ class Order(object):
 
 
         :param ship_date: The ship_date of this Order.  # noqa: E501
-        :type: datetime
+        :type ship_date: datetime
         """
 
         self._ship_date = ship_date
@@ -179,7 +179,7 @@ class Order(object):
         Order Status  # noqa: E501
 
         :param status: The status of this Order.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["placed", "approved", "delivered"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
@@ -206,7 +206,7 @@ class Order(object):
 
 
         :param complete: The complete of this Order.  # noqa: E501
-        :type: bool
+        :type complete: bool
         """
 
         self._complete = complete
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
index c11859114a5..85fe36c7ef0 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/outer_composite.py
@@ -78,7 +78,7 @@ class OuterComposite(object):
 
 
         :param my_number: The my_number of this OuterComposite.  # noqa: E501
-        :type: float
+        :type my_number: float
         """
 
         self._my_number = my_number
@@ -99,7 +99,7 @@ class OuterComposite(object):
 
 
         :param my_string: The my_string of this OuterComposite.  # noqa: E501
-        :type: str
+        :type my_string: str
         """
 
         self._my_string = my_string
@@ -120,7 +120,7 @@ class OuterComposite(object):
 
 
         :param my_boolean: The my_boolean of this OuterComposite.  # noqa: E501
-        :type: bool
+        :type my_boolean: bool
         """
 
         self._my_boolean = my_boolean
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/pet.py b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
index edbf73f5312..b948a6436db 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/pet.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/pet.py
@@ -91,7 +91,7 @@ class Pet(object):
 
 
         :param id: The id of this Pet.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -112,7 +112,7 @@ class Pet(object):
 
 
         :param category: The category of this Pet.  # noqa: E501
-        :type: Category
+        :type category: Category
         """
 
         self._category = category
@@ -133,7 +133,7 @@ class Pet(object):
 
 
         :param name: The name of this Pet.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class Pet(object):
 
 
         :param photo_urls: The photo_urls of this Pet.  # noqa: E501
-        :type: list[str]
+        :type photo_urls: list[str]
         """
         if self.local_vars_configuration.client_side_validation and photo_urls is None:  # noqa: E501
             raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class Pet(object):
 
 
         :param tags: The tags of this Pet.  # noqa: E501
-        :type: list[Tag]
+        :type tags: list[Tag]
         """
 
         self._tags = tags
@@ -202,7 +202,7 @@ class Pet(object):
         pet status in the store  # noqa: E501
 
         :param status: The status of this Pet.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["available", "pending", "sold"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
index a84679e98de..3a305087dc2 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/read_only_first.py
@@ -73,7 +73,7 @@ class ReadOnlyFirst(object):
 
 
         :param bar: The bar of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class ReadOnlyFirst(object):
 
 
         :param baz: The baz of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type baz: str
         """
 
         self._baz = baz
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
index 396e75bcee5..d2535eb65ac 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/special_model_name.py
@@ -68,7 +68,7 @@ class SpecialModelName(object):
 
 
         :param special_property_name: The special_property_name of this SpecialModelName.  # noqa: E501
-        :type: int
+        :type special_property_name: int
         """
 
         self._special_property_name = special_property_name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/tag.py b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
index d6137fdd47f..7492d30d9eb 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/tag.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/tag.py
@@ -73,7 +73,7 @@ class Tag(object):
 
 
         :param id: The id of this Tag.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -94,7 +94,7 @@ class Tag(object):
 
 
         :param name: The name of this Tag.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/type_holder_default.py b/samples/client/petstore/python-tornado/petstore_api/models/type_holder_default.py
index 8163ea77aa7..fbef6b4b157 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/type_holder_default.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/type_holder_default.py
@@ -83,7 +83,7 @@ class TypeHolderDefault(object):
 
 
         :param string_item: The string_item of this TypeHolderDefault.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -106,7 +106,7 @@ class TypeHolderDefault(object):
 
 
         :param number_item: The number_item of this TypeHolderDefault.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -129,7 +129,7 @@ class TypeHolderDefault(object):
 
 
         :param integer_item: The integer_item of this TypeHolderDefault.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -152,7 +152,7 @@ class TypeHolderDefault(object):
 
 
         :param bool_item: The bool_item of this TypeHolderDefault.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -175,7 +175,7 @@ class TypeHolderDefault(object):
 
 
         :param array_item: The array_item of this TypeHolderDefault.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/type_holder_example.py b/samples/client/petstore/python-tornado/petstore_api/models/type_holder_example.py
index 34481fd21e3..b7320bed0ca 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/type_holder_example.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/type_holder_example.py
@@ -87,7 +87,7 @@ class TypeHolderExample(object):
 
 
         :param string_item: The string_item of this TypeHolderExample.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -110,7 +110,7 @@ class TypeHolderExample(object):
 
 
         :param number_item: The number_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -133,7 +133,7 @@ class TypeHolderExample(object):
 
 
         :param float_item: The float_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type float_item: float
         """
         if self.local_vars_configuration.client_side_validation and float_item is None:  # noqa: E501
             raise ValueError("Invalid value for `float_item`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class TypeHolderExample(object):
 
 
         :param integer_item: The integer_item of this TypeHolderExample.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class TypeHolderExample(object):
 
 
         :param bool_item: The bool_item of this TypeHolderExample.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -202,7 +202,7 @@ class TypeHolderExample(object):
 
 
         :param array_item: The array_item of this TypeHolderExample.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/user.py b/samples/client/petstore/python-tornado/petstore_api/models/user.py
index de88bda4cde..0e25f9f1710 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/user.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/user.py
@@ -103,7 +103,7 @@ class User(object):
 
 
         :param id: The id of this User.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -124,7 +124,7 @@ class User(object):
 
 
         :param username: The username of this User.  # noqa: E501
-        :type: str
+        :type username: str
         """
 
         self._username = username
@@ -145,7 +145,7 @@ class User(object):
 
 
         :param first_name: The first_name of this User.  # noqa: E501
-        :type: str
+        :type first_name: str
         """
 
         self._first_name = first_name
@@ -166,7 +166,7 @@ class User(object):
 
 
         :param last_name: The last_name of this User.  # noqa: E501
-        :type: str
+        :type last_name: str
         """
 
         self._last_name = last_name
@@ -187,7 +187,7 @@ class User(object):
 
 
         :param email: The email of this User.  # noqa: E501
-        :type: str
+        :type email: str
         """
 
         self._email = email
@@ -208,7 +208,7 @@ class User(object):
 
 
         :param password: The password of this User.  # noqa: E501
-        :type: str
+        :type password: str
         """
 
         self._password = password
@@ -229,7 +229,7 @@ class User(object):
 
 
         :param phone: The phone of this User.  # noqa: E501
-        :type: str
+        :type phone: str
         """
 
         self._phone = phone
@@ -252,7 +252,7 @@ class User(object):
         User Status  # noqa: E501
 
         :param user_status: The user_status of this User.  # noqa: E501
-        :type: int
+        :type user_status: int
         """
 
         self._user_status = user_status
diff --git a/samples/client/petstore/python-tornado/petstore_api/models/xml_item.py b/samples/client/petstore/python-tornado/petstore_api/models/xml_item.py
index 52ecc9aa522..afb75967cb0 100644
--- a/samples/client/petstore/python-tornado/petstore_api/models/xml_item.py
+++ b/samples/client/petstore/python-tornado/petstore_api/models/xml_item.py
@@ -208,7 +208,7 @@ class XmlItem(object):
 
 
         :param attribute_string: The attribute_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type attribute_string: str
         """
 
         self._attribute_string = attribute_string
@@ -229,7 +229,7 @@ class XmlItem(object):
 
 
         :param attribute_number: The attribute_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type attribute_number: float
         """
 
         self._attribute_number = attribute_number
@@ -250,7 +250,7 @@ class XmlItem(object):
 
 
         :param attribute_integer: The attribute_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type attribute_integer: int
         """
 
         self._attribute_integer = attribute_integer
@@ -271,7 +271,7 @@ class XmlItem(object):
 
 
         :param attribute_boolean: The attribute_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type attribute_boolean: bool
         """
 
         self._attribute_boolean = attribute_boolean
@@ -292,7 +292,7 @@ class XmlItem(object):
 
 
         :param wrapped_array: The wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type wrapped_array: list[int]
         """
 
         self._wrapped_array = wrapped_array
@@ -313,7 +313,7 @@ class XmlItem(object):
 
 
         :param name_string: The name_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type name_string: str
         """
 
         self._name_string = name_string
@@ -334,7 +334,7 @@ class XmlItem(object):
 
 
         :param name_number: The name_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type name_number: float
         """
 
         self._name_number = name_number
@@ -355,7 +355,7 @@ class XmlItem(object):
 
 
         :param name_integer: The name_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type name_integer: int
         """
 
         self._name_integer = name_integer
@@ -376,7 +376,7 @@ class XmlItem(object):
 
 
         :param name_boolean: The name_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type name_boolean: bool
         """
 
         self._name_boolean = name_boolean
@@ -397,7 +397,7 @@ class XmlItem(object):
 
 
         :param name_array: The name_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_array: list[int]
         """
 
         self._name_array = name_array
@@ -418,7 +418,7 @@ class XmlItem(object):
 
 
         :param name_wrapped_array: The name_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_wrapped_array: list[int]
         """
 
         self._name_wrapped_array = name_wrapped_array
@@ -439,7 +439,7 @@ class XmlItem(object):
 
 
         :param prefix_string: The prefix_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_string: str
         """
 
         self._prefix_string = prefix_string
@@ -460,7 +460,7 @@ class XmlItem(object):
 
 
         :param prefix_number: The prefix_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_number: float
         """
 
         self._prefix_number = prefix_number
@@ -481,7 +481,7 @@ class XmlItem(object):
 
 
         :param prefix_integer: The prefix_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_integer: int
         """
 
         self._prefix_integer = prefix_integer
@@ -502,7 +502,7 @@ class XmlItem(object):
 
 
         :param prefix_boolean: The prefix_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_boolean: bool
         """
 
         self._prefix_boolean = prefix_boolean
@@ -523,7 +523,7 @@ class XmlItem(object):
 
 
         :param prefix_array: The prefix_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_array: list[int]
         """
 
         self._prefix_array = prefix_array
@@ -544,7 +544,7 @@ class XmlItem(object):
 
 
         :param prefix_wrapped_array: The prefix_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_wrapped_array: list[int]
         """
 
         self._prefix_wrapped_array = prefix_wrapped_array
@@ -565,7 +565,7 @@ class XmlItem(object):
 
 
         :param namespace_string: The namespace_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type namespace_string: str
         """
 
         self._namespace_string = namespace_string
@@ -586,7 +586,7 @@ class XmlItem(object):
 
 
         :param namespace_number: The namespace_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type namespace_number: float
         """
 
         self._namespace_number = namespace_number
@@ -607,7 +607,7 @@ class XmlItem(object):
 
 
         :param namespace_integer: The namespace_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type namespace_integer: int
         """
 
         self._namespace_integer = namespace_integer
@@ -628,7 +628,7 @@ class XmlItem(object):
 
 
         :param namespace_boolean: The namespace_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type namespace_boolean: bool
         """
 
         self._namespace_boolean = namespace_boolean
@@ -649,7 +649,7 @@ class XmlItem(object):
 
 
         :param namespace_array: The namespace_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_array: list[int]
         """
 
         self._namespace_array = namespace_array
@@ -670,7 +670,7 @@ class XmlItem(object):
 
 
         :param namespace_wrapped_array: The namespace_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_wrapped_array: list[int]
         """
 
         self._namespace_wrapped_array = namespace_wrapped_array
@@ -691,7 +691,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_string: The prefix_ns_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_ns_string: str
         """
 
         self._prefix_ns_string = prefix_ns_string
@@ -712,7 +712,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_number: The prefix_ns_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_ns_number: float
         """
 
         self._prefix_ns_number = prefix_ns_number
@@ -733,7 +733,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_integer: The prefix_ns_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_ns_integer: int
         """
 
         self._prefix_ns_integer = prefix_ns_integer
@@ -754,7 +754,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_boolean: The prefix_ns_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_ns_boolean: bool
         """
 
         self._prefix_ns_boolean = prefix_ns_boolean
@@ -775,7 +775,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_array: The prefix_ns_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_array: list[int]
         """
 
         self._prefix_ns_array = prefix_ns_array
@@ -796,7 +796,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_wrapped_array: The prefix_ns_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_wrapped_array: list[int]
         """
 
         self._prefix_ns_wrapped_array = prefix_ns_wrapped_array
diff --git a/samples/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/client/petstore/python/petstore_api/api/another_fake_api.py
index 77c4c003fe4..4d69b287ca8 100644
--- a/samples/client/petstore/python/petstore_api/api/another_fake_api.py
+++ b/samples/client/petstore/python/petstore_api/api/another_fake_api.py
@@ -42,21 +42,26 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.call_123_test_special_tags_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/api/fake_api.py b/samples/client/petstore/python/petstore_api/api/fake_api.py
index 667c50612ce..e1d9ffebebf 100644
--- a/samples/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/client/petstore/python/petstore_api/api/fake_api.py
@@ -42,21 +42,26 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_xml_item_with_http_info(xml_item, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeApi(object):
         this route creates an XmlItem  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_xml_item_with_http_info(xml_item, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param XmlItem xml_item: XmlItem Body (required)
+        :param xml_item: XmlItem Body (required)
+        :type xml_item: XmlItem
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -156,21 +167,26 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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: bool
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: bool
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_boolean_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -181,23 +197,29 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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.
-        :return: tuple(bool, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(bool, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -266,21 +288,26 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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: OuterComposite
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: OuterComposite
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_composite_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -291,23 +318,29 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite body: Input composite as post body
+        :param body: Input composite as post body
+        :type body: OuterComposite
+        :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.
-        :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -376,21 +409,26 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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: float
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: float
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_number_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -401,23 +439,29 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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.
-        :return: tuple(float, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(float, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -486,21 +530,26 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_string_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -511,23 +560,29 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -596,21 +651,26 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_file_schema_with_http_info(body, **kwargs)  # noqa: E501
@@ -621,23 +681,29 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass body: (required)
+        :param body: (required)
+        :type body: FileSchemaTestClass
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -709,22 +775,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_query_params_with_http_info(query, body, **kwargs)  # noqa: E501
@@ -734,24 +806,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params_with_http_info(query, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User body: (required)
+        :param query: (required)
+        :type query: str
+        :param body: (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -831,21 +910,26 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_client_model_with_http_info(body, **kwargs)  # noqa: E501
@@ -856,23 +940,29 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -949,34 +1039,52 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs)  # noqa: E501
@@ -987,36 +1095,55 @@ class FakeApi(object):
         Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1168,28 +1295,40 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_enum_parameters_with_http_info(**kwargs)  # noqa: E501
@@ -1200,30 +1339,43 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1316,26 +1468,36 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs)  # noqa: E501
@@ -1346,28 +1508,39 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1458,21 +1631,26 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_inline_additional_properties_with_http_info(param, **kwargs)  # noqa: E501
@@ -1482,23 +1660,29 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties_with_http_info(param, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) param: request body (required)
+        :param param: request body (required)
+        :type param: dict(str, str)
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1570,22 +1754,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_json_form_data_with_http_info(param, param2, **kwargs)  # noqa: E501
@@ -1595,24 +1785,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1692,25 +1889,34 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, **kwargs)  # noqa: E501
@@ -1721,27 +1927,37 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
index 2bb189bd01b..d963591a49a 100644
--- a/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
@@ -42,21 +42,26 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_classname_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client body: client model (required)
+        :param body: client model (required)
+        :type body: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/api/pet_api.py b/samples/client/petstore/python/petstore_api/api/pet_api.py
index 5a297a57647..7002fe32740 100644
--- a/samples/client/petstore/python/petstore_api/api/pet_api.py
+++ b/samples/client/petstore/python/petstore_api/api/pet_api.py
@@ -41,21 +41,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.add_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -65,23 +70,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -153,22 +164,28 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_pet_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -178,24 +195,31 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -267,21 +291,26 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_status_with_http_info(status, **kwargs)  # noqa: E501
@@ -292,23 +321,29 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -382,21 +417,26 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_tags_with_http_info(tags, **kwargs)  # noqa: E501
@@ -407,23 +447,29 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -497,21 +543,26 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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: Pet
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Pet
         """
         kwargs['_return_http_data_only'] = True
         return self.get_pet_by_id_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -522,23 +573,29 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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.
-        :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -610,21 +667,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_http_info(body, **kwargs)  # noqa: E501
@@ -634,23 +696,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet body: Pet object that needs to be added to the store (required)
+        :param body: Pet object that needs to be added to the store (required)
+        :type body: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -722,23 +790,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_form_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -748,25 +823,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -844,23 +927,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -870,25 +960,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -970,23 +1068,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs)  # noqa: E501
@@ -996,25 +1101,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/api/store_api.py b/samples/client/petstore/python/petstore_api/api/store_api.py
index f693f755b74..0ede23f05ba 100644
--- a/samples/client/petstore/python/petstore_api/api/store_api.py
+++ b/samples/client/petstore/python/petstore_api/api/store_api.py
@@ -42,21 +42,26 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_order_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -152,20 +163,24 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: dict(str, int)
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: dict(str, int)
         """
         kwargs['_return_http_data_only'] = True
         return self.get_inventory_with_http_info(**kwargs)  # noqa: E501
@@ -176,22 +191,27 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -257,21 +277,26 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.get_order_by_id_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -282,23 +307,29 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -374,21 +405,26 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.place_order_with_http_info(body, **kwargs)  # noqa: E501
@@ -398,23 +434,29 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order body: order placed for purchasing the pet (required)
+        :param body: order placed for purchasing the pet (required)
+        :type body: Order
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/api/user_api.py b/samples/client/petstore/python/petstore_api/api/user_api.py
index 9462f00716a..a912483b023 100644
--- a/samples/client/petstore/python/petstore_api/api/user_api.py
+++ b/samples/client/petstore/python/petstore_api/api/user_api.py
@@ -42,21 +42,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_user_with_http_info(body, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User body: Created user object (required)
+        :param body: Created user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -151,21 +162,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_array_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -175,23 +191,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -259,21 +281,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_list_input_with_http_info(body, **kwargs)  # noqa: E501
@@ -283,23 +310,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input_with_http_info(body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] body: List of user object (required)
+        :param body: List of user object (required)
+        :type body: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -368,21 +401,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_user_with_http_info(username, **kwargs)  # noqa: E501
@@ -393,23 +431,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -477,21 +521,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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: User
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: User
         """
         kwargs['_return_http_data_only'] = True
         return self.get_user_by_name_with_http_info(username, **kwargs)  # noqa: E501
@@ -501,23 +550,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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.
-        :return: tuple(User, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(User, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -589,22 +644,28 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.login_user_with_http_info(username, password, **kwargs)  # noqa: E501
@@ -614,24 +675,31 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user_with_http_info(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -710,20 +778,24 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.logout_user_with_http_info(**kwargs)  # noqa: E501
@@ -733,22 +805,27 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -810,22 +887,28 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_user_with_http_info(username, body, **kwargs)  # noqa: E501
@@ -836,24 +919,31 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user_with_http_info(username, body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User body: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param body: Updated user object (required)
+        :type body: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_any_type.py b/samples/client/petstore/python/petstore_api/models/additional_properties_any_type.py
index 2954285de87..690c71705b9 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_any_type.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_any_type.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesAnyType(object):
 
 
         :param name: The name of this AdditionalPropertiesAnyType.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_array.py b/samples/client/petstore/python/petstore_api/models/additional_properties_array.py
index c6369c22a12..f0902bdaffa 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_array.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_array.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesArray(object):
 
 
         :param name: The name of this AdditionalPropertiesArray.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_boolean.py b/samples/client/petstore/python/petstore_api/models/additional_properties_boolean.py
index 599b7c8b884..f79d2609a1d 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_boolean.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_boolean.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesBoolean(object):
 
 
         :param name: The name of this AdditionalPropertiesBoolean.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
index be4455c683b..ca334635175 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_class.py
@@ -118,7 +118,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_string: The map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, str)
+        :type map_string: dict(str, str)
         """
 
         self._map_string = map_string
@@ -139,7 +139,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_number: The map_number of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, float)
+        :type map_number: dict(str, float)
         """
 
         self._map_number = map_number
@@ -160,7 +160,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_integer: The map_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, int)
+        :type map_integer: dict(str, int)
         """
 
         self._map_integer = map_integer
@@ -181,7 +181,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_boolean: The map_boolean of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, bool)
+        :type map_boolean: dict(str, bool)
         """
 
         self._map_boolean = map_boolean
@@ -202,7 +202,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_integer: The map_array_integer of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[int])
+        :type map_array_integer: dict(str, list[int])
         """
 
         self._map_array_integer = map_array_integer
@@ -223,7 +223,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_array_anytype: The map_array_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, list[object])
+        :type map_array_anytype: dict(str, list[object])
         """
 
         self._map_array_anytype = map_array_anytype
@@ -244,7 +244,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_string: The map_map_string of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_string: dict(str, dict(str, str))
         """
 
         self._map_map_string = map_map_string
@@ -265,7 +265,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_map_anytype: The map_map_anytype of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, object))
+        :type map_map_anytype: dict(str, dict(str, object))
         """
 
         self._map_map_anytype = map_map_anytype
@@ -286,7 +286,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_1: The anytype_1 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_1: object
         """
 
         self._anytype_1 = anytype_1
@@ -307,7 +307,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_2: The anytype_2 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_2: object
         """
 
         self._anytype_2 = anytype_2
@@ -328,7 +328,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param anytype_3: The anytype_3 of this AdditionalPropertiesClass.  # noqa: E501
-        :type: object
+        :type anytype_3: object
         """
 
         self._anytype_3 = anytype_3
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_integer.py b/samples/client/petstore/python/petstore_api/models/additional_properties_integer.py
index ddbb85fdf33..5c3ebf230d1 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_integer.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_integer.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesInteger(object):
 
 
         :param name: The name of this AdditionalPropertiesInteger.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_number.py b/samples/client/petstore/python/petstore_api/models/additional_properties_number.py
index 8bbeda83ecc..0e7f34ed329 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_number.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_number.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesNumber(object):
 
 
         :param name: The name of this AdditionalPropertiesNumber.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_object.py b/samples/client/petstore/python/petstore_api/models/additional_properties_object.py
index af87595b3e4..5a8ea94b929 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_object.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_object.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesObject(object):
 
 
         :param name: The name of this AdditionalPropertiesObject.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/additional_properties_string.py b/samples/client/petstore/python/petstore_api/models/additional_properties_string.py
index 6ab2c91feda..8436a1e345b 100644
--- a/samples/client/petstore/python/petstore_api/models/additional_properties_string.py
+++ b/samples/client/petstore/python/petstore_api/models/additional_properties_string.py
@@ -68,7 +68,7 @@ class AdditionalPropertiesString(object):
 
 
         :param name: The name of this AdditionalPropertiesString.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/animal.py b/samples/client/petstore/python/petstore_api/models/animal.py
index b338e0eb18e..eef35ab093a 100644
--- a/samples/client/petstore/python/petstore_api/models/animal.py
+++ b/samples/client/petstore/python/petstore_api/models/animal.py
@@ -78,7 +78,7 @@ class Animal(object):
 
 
         :param class_name: The class_name of this Animal.  # noqa: E501
-        :type: str
+        :type class_name: str
         """
         if self.local_vars_configuration.client_side_validation and class_name is None:  # noqa: E501
             raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
@@ -101,7 +101,7 @@ class Animal(object):
 
 
         :param color: The color of this Animal.  # noqa: E501
-        :type: str
+        :type color: str
         """
 
         self._color = color
diff --git a/samples/client/petstore/python/petstore_api/models/api_response.py b/samples/client/petstore/python/petstore_api/models/api_response.py
index 24e80d02aea..8cb64673c35 100644
--- a/samples/client/petstore/python/petstore_api/models/api_response.py
+++ b/samples/client/petstore/python/petstore_api/models/api_response.py
@@ -78,7 +78,7 @@ class ApiResponse(object):
 
 
         :param code: The code of this ApiResponse.  # noqa: E501
-        :type: int
+        :type code: int
         """
 
         self._code = code
@@ -99,7 +99,7 @@ class ApiResponse(object):
 
 
         :param type: The type of this ApiResponse.  # noqa: E501
-        :type: str
+        :type type: str
         """
 
         self._type = type
@@ -120,7 +120,7 @@ class ApiResponse(object):
 
 
         :param message: The message of this ApiResponse.  # noqa: E501
-        :type: str
+        :type message: str
         """
 
         self._message = message
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
index 1f654452077..41a689c534a 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfArrayOfNumberOnly(object):
 
 
         :param array_array_number: The array_array_number of this ArrayOfArrayOfNumberOnly.  # noqa: E501
-        :type: list[list[float]]
+        :type array_array_number: list[list[float]]
         """
 
         self._array_array_number = array_array_number
diff --git a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
index 27ba1f58e31..ddb7f7c7abe 100644
--- a/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfNumberOnly(object):
 
 
         :param array_number: The array_number of this ArrayOfNumberOnly.  # noqa: E501
-        :type: list[float]
+        :type array_number: list[float]
         """
 
         self._array_number = array_number
diff --git a/samples/client/petstore/python/petstore_api/models/array_test.py b/samples/client/petstore/python/petstore_api/models/array_test.py
index f34a372f6f3..e8e5c378f98 100644
--- a/samples/client/petstore/python/petstore_api/models/array_test.py
+++ b/samples/client/petstore/python/petstore_api/models/array_test.py
@@ -78,7 +78,7 @@ class ArrayTest(object):
 
 
         :param array_of_string: The array_of_string of this ArrayTest.  # noqa: E501
-        :type: list[str]
+        :type array_of_string: list[str]
         """
 
         self._array_of_string = array_of_string
@@ -99,7 +99,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_integer: The array_array_of_integer of this ArrayTest.  # noqa: E501
-        :type: list[list[int]]
+        :type array_array_of_integer: list[list[int]]
         """
 
         self._array_array_of_integer = array_array_of_integer
@@ -120,7 +120,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_model: The array_array_of_model of this ArrayTest.  # noqa: E501
-        :type: list[list[ReadOnlyFirst]]
+        :type array_array_of_model: list[list[ReadOnlyFirst]]
         """
 
         self._array_array_of_model = array_array_of_model
diff --git a/samples/client/petstore/python/petstore_api/models/big_cat.py b/samples/client/petstore/python/petstore_api/models/big_cat.py
index fe52c3650ac..946981f5b7f 100644
--- a/samples/client/petstore/python/petstore_api/models/big_cat.py
+++ b/samples/client/petstore/python/petstore_api/models/big_cat.py
@@ -68,7 +68,7 @@ class BigCat(object):
 
 
         :param kind: The kind of this BigCat.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/big_cat_all_of.py b/samples/client/petstore/python/petstore_api/models/big_cat_all_of.py
index b75500db987..41c205d2576 100644
--- a/samples/client/petstore/python/petstore_api/models/big_cat_all_of.py
+++ b/samples/client/petstore/python/petstore_api/models/big_cat_all_of.py
@@ -68,7 +68,7 @@ class BigCatAllOf(object):
 
 
         :param kind: The kind of this BigCatAllOf.  # noqa: E501
-        :type: str
+        :type kind: str
         """
         allowed_values = ["lions", "tigers", "leopards", "jaguars"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and kind not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/capitalization.py b/samples/client/petstore/python/petstore_api/models/capitalization.py
index cef34c5f6dc..967d324a0ab 100644
--- a/samples/client/petstore/python/petstore_api/models/capitalization.py
+++ b/samples/client/petstore/python/petstore_api/models/capitalization.py
@@ -93,7 +93,7 @@ class Capitalization(object):
 
 
         :param small_camel: The small_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_camel: str
         """
 
         self._small_camel = small_camel
@@ -114,7 +114,7 @@ class Capitalization(object):
 
 
         :param capital_camel: The capital_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_camel: str
         """
 
         self._capital_camel = capital_camel
@@ -135,7 +135,7 @@ class Capitalization(object):
 
 
         :param small_snake: The small_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_snake: str
         """
 
         self._small_snake = small_snake
@@ -156,7 +156,7 @@ class Capitalization(object):
 
 
         :param capital_snake: The capital_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_snake: str
         """
 
         self._capital_snake = capital_snake
@@ -177,7 +177,7 @@ class Capitalization(object):
 
 
         :param sca_eth_flow_points: The sca_eth_flow_points of this Capitalization.  # noqa: E501
-        :type: str
+        :type sca_eth_flow_points: str
         """
 
         self._sca_eth_flow_points = sca_eth_flow_points
@@ -200,7 +200,7 @@ class Capitalization(object):
         Name of the pet   # noqa: E501
 
         :param att_name: The att_name of this Capitalization.  # noqa: E501
-        :type: str
+        :type att_name: str
         """
 
         self._att_name = att_name
diff --git a/samples/client/petstore/python/petstore_api/models/cat.py b/samples/client/petstore/python/petstore_api/models/cat.py
index e39c1c82508..b3b0d868c7f 100644
--- a/samples/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/client/petstore/python/petstore_api/models/cat.py
@@ -68,7 +68,7 @@ class Cat(object):
 
 
         :param declawed: The declawed of this Cat.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python/petstore_api/models/cat_all_of.py b/samples/client/petstore/python/petstore_api/models/cat_all_of.py
index 7e90fab9348..f573a04636c 100644
--- a/samples/client/petstore/python/petstore_api/models/cat_all_of.py
+++ b/samples/client/petstore/python/petstore_api/models/cat_all_of.py
@@ -68,7 +68,7 @@ class CatAllOf(object):
 
 
         :param declawed: The declawed of this CatAllOf.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/client/petstore/python/petstore_api/models/category.py b/samples/client/petstore/python/petstore_api/models/category.py
index b47c148953e..11a7bf85f3a 100644
--- a/samples/client/petstore/python/petstore_api/models/category.py
+++ b/samples/client/petstore/python/petstore_api/models/category.py
@@ -72,7 +72,7 @@ class Category(object):
 
 
         :param id: The id of this Category.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -93,7 +93,7 @@ class Category(object):
 
 
         :param name: The name of this Category.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/class_model.py b/samples/client/petstore/python/petstore_api/models/class_model.py
index ef6060ffa70..aac505ea064 100644
--- a/samples/client/petstore/python/petstore_api/models/class_model.py
+++ b/samples/client/petstore/python/petstore_api/models/class_model.py
@@ -68,7 +68,7 @@ class ClassModel(object):
 
 
         :param _class: The _class of this ClassModel.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python/petstore_api/models/client.py b/samples/client/petstore/python/petstore_api/models/client.py
index ee5dbf1c43a..2006350b210 100644
--- a/samples/client/petstore/python/petstore_api/models/client.py
+++ b/samples/client/petstore/python/petstore_api/models/client.py
@@ -68,7 +68,7 @@ class Client(object):
 
 
         :param client: The client of this Client.  # noqa: E501
-        :type: str
+        :type client: str
         """
 
         self._client = client
diff --git a/samples/client/petstore/python/petstore_api/models/dog.py b/samples/client/petstore/python/petstore_api/models/dog.py
index eacb63eedb0..fb9024d0bb7 100644
--- a/samples/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/client/petstore/python/petstore_api/models/dog.py
@@ -68,7 +68,7 @@ class Dog(object):
 
 
         :param breed: The breed of this Dog.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python/petstore_api/models/dog_all_of.py b/samples/client/petstore/python/petstore_api/models/dog_all_of.py
index 48e04855708..5943ba900dd 100644
--- a/samples/client/petstore/python/petstore_api/models/dog_all_of.py
+++ b/samples/client/petstore/python/petstore_api/models/dog_all_of.py
@@ -68,7 +68,7 @@ class DogAllOf(object):
 
 
         :param breed: The breed of this DogAllOf.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/client/petstore/python/petstore_api/models/enum_arrays.py b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
index 819ff322157..ae2ea1d4251 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_arrays.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_arrays.py
@@ -73,7 +73,7 @@ class EnumArrays(object):
 
 
         :param just_symbol: The just_symbol of this EnumArrays.  # noqa: E501
-        :type: str
+        :type just_symbol: str
         """
         allowed_values = [">=", "$"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and just_symbol not in allowed_values:  # noqa: E501
@@ -100,7 +100,7 @@ class EnumArrays(object):
 
 
         :param array_enum: The array_enum of this EnumArrays.  # noqa: E501
-        :type: list[str]
+        :type array_enum: list[str]
         """
         allowed_values = ["fish", "crab"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
diff --git a/samples/client/petstore/python/petstore_api/models/enum_test.py b/samples/client/petstore/python/petstore_api/models/enum_test.py
index 464281b3ec0..e9872c4d005 100644
--- a/samples/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/client/petstore/python/petstore_api/models/enum_test.py
@@ -87,7 +87,7 @@ class EnumTest(object):
 
 
         :param enum_string: The enum_string of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string: str
         """
         allowed_values = ["UPPER", "lower", ""]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_string not in allowed_values:  # noqa: E501
@@ -114,7 +114,7 @@ class EnumTest(object):
 
 
         :param enum_string_required: The enum_string_required of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string_required: str
         """
         if self.local_vars_configuration.client_side_validation and enum_string_required is None:  # noqa: E501
             raise ValueError("Invalid value for `enum_string_required`, must not be `None`")  # noqa: E501
@@ -143,7 +143,7 @@ class EnumTest(object):
 
 
         :param enum_integer: The enum_integer of this EnumTest.  # noqa: E501
-        :type: int
+        :type enum_integer: int
         """
         allowed_values = [1, -1]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_integer not in allowed_values:  # noqa: E501
@@ -170,7 +170,7 @@ class EnumTest(object):
 
 
         :param enum_number: The enum_number of this EnumTest.  # noqa: E501
-        :type: float
+        :type enum_number: float
         """
         allowed_values = [1.1, -1.2]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_number not in allowed_values:  # noqa: E501
@@ -197,7 +197,7 @@ class EnumTest(object):
 
 
         :param outer_enum: The outer_enum of this EnumTest.  # noqa: E501
-        :type: OuterEnum
+        :type outer_enum: OuterEnum
         """
 
         self._outer_enum = outer_enum
diff --git a/samples/client/petstore/python/petstore_api/models/file.py b/samples/client/petstore/python/petstore_api/models/file.py
index 282df2957e6..4fb5c31762e 100644
--- a/samples/client/petstore/python/petstore_api/models/file.py
+++ b/samples/client/petstore/python/petstore_api/models/file.py
@@ -70,7 +70,7 @@ class File(object):
         Test capitalization  # noqa: E501
 
         :param source_uri: The source_uri of this File.  # noqa: E501
-        :type: str
+        :type source_uri: str
         """
 
         self._source_uri = source_uri
diff --git a/samples/client/petstore/python/petstore_api/models/file_schema_test_class.py b/samples/client/petstore/python/petstore_api/models/file_schema_test_class.py
index de7f865b47e..2f2d44a7b33 100644
--- a/samples/client/petstore/python/petstore_api/models/file_schema_test_class.py
+++ b/samples/client/petstore/python/petstore_api/models/file_schema_test_class.py
@@ -73,7 +73,7 @@ class FileSchemaTestClass(object):
 
 
         :param file: The file of this FileSchemaTestClass.  # noqa: E501
-        :type: File
+        :type file: File
         """
 
         self._file = file
@@ -94,7 +94,7 @@ class FileSchemaTestClass(object):
 
 
         :param files: The files of this FileSchemaTestClass.  # noqa: E501
-        :type: list[File]
+        :type files: list[File]
         """
 
         self._files = files
diff --git a/samples/client/petstore/python/petstore_api/models/format_test.py b/samples/client/petstore/python/petstore_api/models/format_test.py
index 6396c442f62..c96f8132fa6 100644
--- a/samples/client/petstore/python/petstore_api/models/format_test.py
+++ b/samples/client/petstore/python/petstore_api/models/format_test.py
@@ -129,7 +129,7 @@ class FormatTest(object):
 
 
         :param integer: The integer of this FormatTest.  # noqa: E501
-        :type: int
+        :type integer: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 integer is not None and integer > 100):  # noqa: E501
@@ -156,7 +156,7 @@ class FormatTest(object):
 
 
         :param int32: The int32 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int32: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 int32 is not None and int32 > 200):  # noqa: E501
@@ -183,7 +183,7 @@ class FormatTest(object):
 
 
         :param int64: The int64 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int64: int
         """
 
         self._int64 = int64
@@ -204,7 +204,7 @@ class FormatTest(object):
 
 
         :param number: The number of this FormatTest.  # noqa: E501
-        :type: float
+        :type number: float
         """
         if self.local_vars_configuration.client_side_validation and number is None:  # noqa: E501
             raise ValueError("Invalid value for `number`, must not be `None`")  # noqa: E501
@@ -233,7 +233,7 @@ class FormatTest(object):
 
 
         :param float: The float of this FormatTest.  # noqa: E501
-        :type: float
+        :type float: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 float is not None and float > 987.6):  # noqa: E501
@@ -260,7 +260,7 @@ class FormatTest(object):
 
 
         :param double: The double of this FormatTest.  # noqa: E501
-        :type: float
+        :type double: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 double is not None and double > 123.4):  # noqa: E501
@@ -287,7 +287,7 @@ class FormatTest(object):
 
 
         :param string: The string of this FormatTest.  # noqa: E501
-        :type: str
+        :type string: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 string is not None and not re.search(r'[a-z]', string, flags=re.IGNORECASE)):  # noqa: E501
@@ -311,7 +311,7 @@ class FormatTest(object):
 
 
         :param byte: The byte of this FormatTest.  # noqa: E501
-        :type: str
+        :type byte: str
         """
         if self.local_vars_configuration.client_side_validation and byte is None:  # noqa: E501
             raise ValueError("Invalid value for `byte`, must not be `None`")  # noqa: E501
@@ -337,7 +337,7 @@ class FormatTest(object):
 
 
         :param binary: The binary of this FormatTest.  # noqa: E501
-        :type: file
+        :type binary: file
         """
 
         self._binary = binary
@@ -358,7 +358,7 @@ class FormatTest(object):
 
 
         :param date: The date of this FormatTest.  # noqa: E501
-        :type: date
+        :type date: date
         """
         if self.local_vars_configuration.client_side_validation and date is None:  # noqa: E501
             raise ValueError("Invalid value for `date`, must not be `None`")  # noqa: E501
@@ -381,7 +381,7 @@ class FormatTest(object):
 
 
         :param date_time: The date_time of this FormatTest.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -402,7 +402,7 @@ class FormatTest(object):
 
 
         :param uuid: The uuid of this FormatTest.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -423,7 +423,7 @@ class FormatTest(object):
 
 
         :param password: The password of this FormatTest.  # noqa: E501
-        :type: str
+        :type password: str
         """
         if self.local_vars_configuration.client_side_validation and password is None:  # noqa: E501
             raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
@@ -452,7 +452,7 @@ class FormatTest(object):
 
 
         :param big_decimal: The big_decimal of this FormatTest.  # noqa: E501
-        :type: BigDecimal
+        :type big_decimal: BigDecimal
         """
 
         self._big_decimal = big_decimal
diff --git a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
index 5fc2f8a9ebd..fa496519ecb 100644
--- a/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
+++ b/samples/client/petstore/python/petstore_api/models/has_only_read_only.py
@@ -73,7 +73,7 @@ class HasOnlyReadOnly(object):
 
 
         :param bar: The bar of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class HasOnlyReadOnly(object):
 
 
         :param foo: The foo of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type foo: str
         """
 
         self._foo = foo
diff --git a/samples/client/petstore/python/petstore_api/models/list.py b/samples/client/petstore/python/petstore_api/models/list.py
index d58d13e90fb..e21a220f71c 100644
--- a/samples/client/petstore/python/petstore_api/models/list.py
+++ b/samples/client/petstore/python/petstore_api/models/list.py
@@ -68,7 +68,7 @@ class List(object):
 
 
         :param _123_list: The _123_list of this List.  # noqa: E501
-        :type: str
+        :type _123_list: str
         """
 
         self.__123_list = _123_list
diff --git a/samples/client/petstore/python/petstore_api/models/map_test.py b/samples/client/petstore/python/petstore_api/models/map_test.py
index f0cfba5073b..8afc875ce51 100644
--- a/samples/client/petstore/python/petstore_api/models/map_test.py
+++ b/samples/client/petstore/python/petstore_api/models/map_test.py
@@ -83,7 +83,7 @@ class MapTest(object):
 
 
         :param map_map_of_string: The map_map_of_string of this MapTest.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_of_string: dict(str, dict(str, str))
         """
 
         self._map_map_of_string = map_map_of_string
@@ -104,7 +104,7 @@ class MapTest(object):
 
 
         :param map_of_enum_string: The map_of_enum_string of this MapTest.  # noqa: E501
-        :type: dict(str, str)
+        :type map_of_enum_string: dict(str, str)
         """
         allowed_values = ["UPPER", "lower"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
@@ -133,7 +133,7 @@ class MapTest(object):
 
 
         :param direct_map: The direct_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type direct_map: dict(str, bool)
         """
 
         self._direct_map = direct_map
@@ -154,7 +154,7 @@ class MapTest(object):
 
 
         :param indirect_map: The indirect_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type indirect_map: dict(str, bool)
         """
 
         self._indirect_map = indirect_map
diff --git a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 5da34f8830e..8aecbf0f558 100644
--- a/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -78,7 +78,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -99,7 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -120,7 +120,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, Animal)
+        :type map: dict(str, Animal)
         """
 
         self._map = map
diff --git a/samples/client/petstore/python/petstore_api/models/model200_response.py b/samples/client/petstore/python/petstore_api/models/model200_response.py
index 841ce1f18f3..3f4c4e2bd2a 100644
--- a/samples/client/petstore/python/petstore_api/models/model200_response.py
+++ b/samples/client/petstore/python/petstore_api/models/model200_response.py
@@ -73,7 +73,7 @@ class Model200Response(object):
 
 
         :param name: The name of this Model200Response.  # noqa: E501
-        :type: int
+        :type name: int
         """
 
         self._name = name
@@ -94,7 +94,7 @@ class Model200Response(object):
 
 
         :param _class: The _class of this Model200Response.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/client/petstore/python/petstore_api/models/model_return.py b/samples/client/petstore/python/petstore_api/models/model_return.py
index fdd8d72314a..1009c50ef08 100644
--- a/samples/client/petstore/python/petstore_api/models/model_return.py
+++ b/samples/client/petstore/python/petstore_api/models/model_return.py
@@ -68,7 +68,7 @@ class ModelReturn(object):
 
 
         :param _return: The _return of this ModelReturn.  # noqa: E501
-        :type: int
+        :type _return: int
         """
 
         self.__return = _return
diff --git a/samples/client/petstore/python/petstore_api/models/name.py b/samples/client/petstore/python/petstore_api/models/name.py
index bb2c1fbd73c..6ee8261e782 100644
--- a/samples/client/petstore/python/petstore_api/models/name.py
+++ b/samples/client/petstore/python/petstore_api/models/name.py
@@ -82,7 +82,7 @@ class Name(object):
 
 
         :param name: The name of this Name.  # noqa: E501
-        :type: int
+        :type name: int
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -105,7 +105,7 @@ class Name(object):
 
 
         :param snake_case: The snake_case of this Name.  # noqa: E501
-        :type: int
+        :type snake_case: int
         """
 
         self._snake_case = snake_case
@@ -126,7 +126,7 @@ class Name(object):
 
 
         :param _property: The _property of this Name.  # noqa: E501
-        :type: str
+        :type _property: str
         """
 
         self.__property = _property
@@ -147,7 +147,7 @@ class Name(object):
 
 
         :param _123_number: The _123_number of this Name.  # noqa: E501
-        :type: int
+        :type _123_number: int
         """
 
         self.__123_number = _123_number
diff --git a/samples/client/petstore/python/petstore_api/models/number_only.py b/samples/client/petstore/python/petstore_api/models/number_only.py
index 99b2424852f..90f09d8b7d5 100644
--- a/samples/client/petstore/python/petstore_api/models/number_only.py
+++ b/samples/client/petstore/python/petstore_api/models/number_only.py
@@ -68,7 +68,7 @@ class NumberOnly(object):
 
 
         :param just_number: The just_number of this NumberOnly.  # noqa: E501
-        :type: float
+        :type just_number: float
         """
 
         self._just_number = just_number
diff --git a/samples/client/petstore/python/petstore_api/models/order.py b/samples/client/petstore/python/petstore_api/models/order.py
index 8c863cce8fe..8f298aa3d9c 100644
--- a/samples/client/petstore/python/petstore_api/models/order.py
+++ b/samples/client/petstore/python/petstore_api/models/order.py
@@ -93,7 +93,7 @@ class Order(object):
 
 
         :param id: The id of this Order.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -114,7 +114,7 @@ class Order(object):
 
 
         :param pet_id: The pet_id of this Order.  # noqa: E501
-        :type: int
+        :type pet_id: int
         """
 
         self._pet_id = pet_id
@@ -135,7 +135,7 @@ class Order(object):
 
 
         :param quantity: The quantity of this Order.  # noqa: E501
-        :type: int
+        :type quantity: int
         """
 
         self._quantity = quantity
@@ -156,7 +156,7 @@ class Order(object):
 
 
         :param ship_date: The ship_date of this Order.  # noqa: E501
-        :type: datetime
+        :type ship_date: datetime
         """
 
         self._ship_date = ship_date
@@ -179,7 +179,7 @@ class Order(object):
         Order Status  # noqa: E501
 
         :param status: The status of this Order.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["placed", "approved", "delivered"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
@@ -206,7 +206,7 @@ class Order(object):
 
 
         :param complete: The complete of this Order.  # noqa: E501
-        :type: bool
+        :type complete: bool
         """
 
         self._complete = complete
diff --git a/samples/client/petstore/python/petstore_api/models/outer_composite.py b/samples/client/petstore/python/petstore_api/models/outer_composite.py
index c11859114a5..85fe36c7ef0 100644
--- a/samples/client/petstore/python/petstore_api/models/outer_composite.py
+++ b/samples/client/petstore/python/petstore_api/models/outer_composite.py
@@ -78,7 +78,7 @@ class OuterComposite(object):
 
 
         :param my_number: The my_number of this OuterComposite.  # noqa: E501
-        :type: float
+        :type my_number: float
         """
 
         self._my_number = my_number
@@ -99,7 +99,7 @@ class OuterComposite(object):
 
 
         :param my_string: The my_string of this OuterComposite.  # noqa: E501
-        :type: str
+        :type my_string: str
         """
 
         self._my_string = my_string
@@ -120,7 +120,7 @@ class OuterComposite(object):
 
 
         :param my_boolean: The my_boolean of this OuterComposite.  # noqa: E501
-        :type: bool
+        :type my_boolean: bool
         """
 
         self._my_boolean = my_boolean
diff --git a/samples/client/petstore/python/petstore_api/models/pet.py b/samples/client/petstore/python/petstore_api/models/pet.py
index edbf73f5312..b948a6436db 100644
--- a/samples/client/petstore/python/petstore_api/models/pet.py
+++ b/samples/client/petstore/python/petstore_api/models/pet.py
@@ -91,7 +91,7 @@ class Pet(object):
 
 
         :param id: The id of this Pet.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -112,7 +112,7 @@ class Pet(object):
 
 
         :param category: The category of this Pet.  # noqa: E501
-        :type: Category
+        :type category: Category
         """
 
         self._category = category
@@ -133,7 +133,7 @@ class Pet(object):
 
 
         :param name: The name of this Pet.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class Pet(object):
 
 
         :param photo_urls: The photo_urls of this Pet.  # noqa: E501
-        :type: list[str]
+        :type photo_urls: list[str]
         """
         if self.local_vars_configuration.client_side_validation and photo_urls is None:  # noqa: E501
             raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class Pet(object):
 
 
         :param tags: The tags of this Pet.  # noqa: E501
-        :type: list[Tag]
+        :type tags: list[Tag]
         """
 
         self._tags = tags
@@ -202,7 +202,7 @@ class Pet(object):
         pet status in the store  # noqa: E501
 
         :param status: The status of this Pet.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["available", "pending", "sold"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/read_only_first.py b/samples/client/petstore/python/petstore_api/models/read_only_first.py
index a84679e98de..3a305087dc2 100644
--- a/samples/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/client/petstore/python/petstore_api/models/read_only_first.py
@@ -73,7 +73,7 @@ class ReadOnlyFirst(object):
 
 
         :param bar: The bar of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class ReadOnlyFirst(object):
 
 
         :param baz: The baz of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type baz: str
         """
 
         self._baz = baz
diff --git a/samples/client/petstore/python/petstore_api/models/special_model_name.py b/samples/client/petstore/python/petstore_api/models/special_model_name.py
index 396e75bcee5..d2535eb65ac 100644
--- a/samples/client/petstore/python/petstore_api/models/special_model_name.py
+++ b/samples/client/petstore/python/petstore_api/models/special_model_name.py
@@ -68,7 +68,7 @@ class SpecialModelName(object):
 
 
         :param special_property_name: The special_property_name of this SpecialModelName.  # noqa: E501
-        :type: int
+        :type special_property_name: int
         """
 
         self._special_property_name = special_property_name
diff --git a/samples/client/petstore/python/petstore_api/models/tag.py b/samples/client/petstore/python/petstore_api/models/tag.py
index d6137fdd47f..7492d30d9eb 100644
--- a/samples/client/petstore/python/petstore_api/models/tag.py
+++ b/samples/client/petstore/python/petstore_api/models/tag.py
@@ -73,7 +73,7 @@ class Tag(object):
 
 
         :param id: The id of this Tag.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -94,7 +94,7 @@ class Tag(object):
 
 
         :param name: The name of this Tag.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/client/petstore/python/petstore_api/models/type_holder_default.py b/samples/client/petstore/python/petstore_api/models/type_holder_default.py
index 8163ea77aa7..fbef6b4b157 100644
--- a/samples/client/petstore/python/petstore_api/models/type_holder_default.py
+++ b/samples/client/petstore/python/petstore_api/models/type_holder_default.py
@@ -83,7 +83,7 @@ class TypeHolderDefault(object):
 
 
         :param string_item: The string_item of this TypeHolderDefault.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -106,7 +106,7 @@ class TypeHolderDefault(object):
 
 
         :param number_item: The number_item of this TypeHolderDefault.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -129,7 +129,7 @@ class TypeHolderDefault(object):
 
 
         :param integer_item: The integer_item of this TypeHolderDefault.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -152,7 +152,7 @@ class TypeHolderDefault(object):
 
 
         :param bool_item: The bool_item of this TypeHolderDefault.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -175,7 +175,7 @@ class TypeHolderDefault(object):
 
 
         :param array_item: The array_item of this TypeHolderDefault.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/type_holder_example.py b/samples/client/petstore/python/petstore_api/models/type_holder_example.py
index 34481fd21e3..b7320bed0ca 100644
--- a/samples/client/petstore/python/petstore_api/models/type_holder_example.py
+++ b/samples/client/petstore/python/petstore_api/models/type_holder_example.py
@@ -87,7 +87,7 @@ class TypeHolderExample(object):
 
 
         :param string_item: The string_item of this TypeHolderExample.  # noqa: E501
-        :type: str
+        :type string_item: str
         """
         if self.local_vars_configuration.client_side_validation and string_item is None:  # noqa: E501
             raise ValueError("Invalid value for `string_item`, must not be `None`")  # noqa: E501
@@ -110,7 +110,7 @@ class TypeHolderExample(object):
 
 
         :param number_item: The number_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type number_item: float
         """
         if self.local_vars_configuration.client_side_validation and number_item is None:  # noqa: E501
             raise ValueError("Invalid value for `number_item`, must not be `None`")  # noqa: E501
@@ -133,7 +133,7 @@ class TypeHolderExample(object):
 
 
         :param float_item: The float_item of this TypeHolderExample.  # noqa: E501
-        :type: float
+        :type float_item: float
         """
         if self.local_vars_configuration.client_side_validation and float_item is None:  # noqa: E501
             raise ValueError("Invalid value for `float_item`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class TypeHolderExample(object):
 
 
         :param integer_item: The integer_item of this TypeHolderExample.  # noqa: E501
-        :type: int
+        :type integer_item: int
         """
         if self.local_vars_configuration.client_side_validation and integer_item is None:  # noqa: E501
             raise ValueError("Invalid value for `integer_item`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class TypeHolderExample(object):
 
 
         :param bool_item: The bool_item of this TypeHolderExample.  # noqa: E501
-        :type: bool
+        :type bool_item: bool
         """
         if self.local_vars_configuration.client_side_validation and bool_item is None:  # noqa: E501
             raise ValueError("Invalid value for `bool_item`, must not be `None`")  # noqa: E501
@@ -202,7 +202,7 @@ class TypeHolderExample(object):
 
 
         :param array_item: The array_item of this TypeHolderExample.  # noqa: E501
-        :type: list[int]
+        :type array_item: list[int]
         """
         if self.local_vars_configuration.client_side_validation and array_item is None:  # noqa: E501
             raise ValueError("Invalid value for `array_item`, must not be `None`")  # noqa: E501
diff --git a/samples/client/petstore/python/petstore_api/models/user.py b/samples/client/petstore/python/petstore_api/models/user.py
index de88bda4cde..0e25f9f1710 100644
--- a/samples/client/petstore/python/petstore_api/models/user.py
+++ b/samples/client/petstore/python/petstore_api/models/user.py
@@ -103,7 +103,7 @@ class User(object):
 
 
         :param id: The id of this User.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -124,7 +124,7 @@ class User(object):
 
 
         :param username: The username of this User.  # noqa: E501
-        :type: str
+        :type username: str
         """
 
         self._username = username
@@ -145,7 +145,7 @@ class User(object):
 
 
         :param first_name: The first_name of this User.  # noqa: E501
-        :type: str
+        :type first_name: str
         """
 
         self._first_name = first_name
@@ -166,7 +166,7 @@ class User(object):
 
 
         :param last_name: The last_name of this User.  # noqa: E501
-        :type: str
+        :type last_name: str
         """
 
         self._last_name = last_name
@@ -187,7 +187,7 @@ class User(object):
 
 
         :param email: The email of this User.  # noqa: E501
-        :type: str
+        :type email: str
         """
 
         self._email = email
@@ -208,7 +208,7 @@ class User(object):
 
 
         :param password: The password of this User.  # noqa: E501
-        :type: str
+        :type password: str
         """
 
         self._password = password
@@ -229,7 +229,7 @@ class User(object):
 
 
         :param phone: The phone of this User.  # noqa: E501
-        :type: str
+        :type phone: str
         """
 
         self._phone = phone
@@ -252,7 +252,7 @@ class User(object):
         User Status  # noqa: E501
 
         :param user_status: The user_status of this User.  # noqa: E501
-        :type: int
+        :type user_status: int
         """
 
         self._user_status = user_status
diff --git a/samples/client/petstore/python/petstore_api/models/xml_item.py b/samples/client/petstore/python/petstore_api/models/xml_item.py
index 52ecc9aa522..afb75967cb0 100644
--- a/samples/client/petstore/python/petstore_api/models/xml_item.py
+++ b/samples/client/petstore/python/petstore_api/models/xml_item.py
@@ -208,7 +208,7 @@ class XmlItem(object):
 
 
         :param attribute_string: The attribute_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type attribute_string: str
         """
 
         self._attribute_string = attribute_string
@@ -229,7 +229,7 @@ class XmlItem(object):
 
 
         :param attribute_number: The attribute_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type attribute_number: float
         """
 
         self._attribute_number = attribute_number
@@ -250,7 +250,7 @@ class XmlItem(object):
 
 
         :param attribute_integer: The attribute_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type attribute_integer: int
         """
 
         self._attribute_integer = attribute_integer
@@ -271,7 +271,7 @@ class XmlItem(object):
 
 
         :param attribute_boolean: The attribute_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type attribute_boolean: bool
         """
 
         self._attribute_boolean = attribute_boolean
@@ -292,7 +292,7 @@ class XmlItem(object):
 
 
         :param wrapped_array: The wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type wrapped_array: list[int]
         """
 
         self._wrapped_array = wrapped_array
@@ -313,7 +313,7 @@ class XmlItem(object):
 
 
         :param name_string: The name_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type name_string: str
         """
 
         self._name_string = name_string
@@ -334,7 +334,7 @@ class XmlItem(object):
 
 
         :param name_number: The name_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type name_number: float
         """
 
         self._name_number = name_number
@@ -355,7 +355,7 @@ class XmlItem(object):
 
 
         :param name_integer: The name_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type name_integer: int
         """
 
         self._name_integer = name_integer
@@ -376,7 +376,7 @@ class XmlItem(object):
 
 
         :param name_boolean: The name_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type name_boolean: bool
         """
 
         self._name_boolean = name_boolean
@@ -397,7 +397,7 @@ class XmlItem(object):
 
 
         :param name_array: The name_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_array: list[int]
         """
 
         self._name_array = name_array
@@ -418,7 +418,7 @@ class XmlItem(object):
 
 
         :param name_wrapped_array: The name_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type name_wrapped_array: list[int]
         """
 
         self._name_wrapped_array = name_wrapped_array
@@ -439,7 +439,7 @@ class XmlItem(object):
 
 
         :param prefix_string: The prefix_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_string: str
         """
 
         self._prefix_string = prefix_string
@@ -460,7 +460,7 @@ class XmlItem(object):
 
 
         :param prefix_number: The prefix_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_number: float
         """
 
         self._prefix_number = prefix_number
@@ -481,7 +481,7 @@ class XmlItem(object):
 
 
         :param prefix_integer: The prefix_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_integer: int
         """
 
         self._prefix_integer = prefix_integer
@@ -502,7 +502,7 @@ class XmlItem(object):
 
 
         :param prefix_boolean: The prefix_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_boolean: bool
         """
 
         self._prefix_boolean = prefix_boolean
@@ -523,7 +523,7 @@ class XmlItem(object):
 
 
         :param prefix_array: The prefix_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_array: list[int]
         """
 
         self._prefix_array = prefix_array
@@ -544,7 +544,7 @@ class XmlItem(object):
 
 
         :param prefix_wrapped_array: The prefix_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_wrapped_array: list[int]
         """
 
         self._prefix_wrapped_array = prefix_wrapped_array
@@ -565,7 +565,7 @@ class XmlItem(object):
 
 
         :param namespace_string: The namespace_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type namespace_string: str
         """
 
         self._namespace_string = namespace_string
@@ -586,7 +586,7 @@ class XmlItem(object):
 
 
         :param namespace_number: The namespace_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type namespace_number: float
         """
 
         self._namespace_number = namespace_number
@@ -607,7 +607,7 @@ class XmlItem(object):
 
 
         :param namespace_integer: The namespace_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type namespace_integer: int
         """
 
         self._namespace_integer = namespace_integer
@@ -628,7 +628,7 @@ class XmlItem(object):
 
 
         :param namespace_boolean: The namespace_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type namespace_boolean: bool
         """
 
         self._namespace_boolean = namespace_boolean
@@ -649,7 +649,7 @@ class XmlItem(object):
 
 
         :param namespace_array: The namespace_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_array: list[int]
         """
 
         self._namespace_array = namespace_array
@@ -670,7 +670,7 @@ class XmlItem(object):
 
 
         :param namespace_wrapped_array: The namespace_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type namespace_wrapped_array: list[int]
         """
 
         self._namespace_wrapped_array = namespace_wrapped_array
@@ -691,7 +691,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_string: The prefix_ns_string of this XmlItem.  # noqa: E501
-        :type: str
+        :type prefix_ns_string: str
         """
 
         self._prefix_ns_string = prefix_ns_string
@@ -712,7 +712,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_number: The prefix_ns_number of this XmlItem.  # noqa: E501
-        :type: float
+        :type prefix_ns_number: float
         """
 
         self._prefix_ns_number = prefix_ns_number
@@ -733,7 +733,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_integer: The prefix_ns_integer of this XmlItem.  # noqa: E501
-        :type: int
+        :type prefix_ns_integer: int
         """
 
         self._prefix_ns_integer = prefix_ns_integer
@@ -754,7 +754,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_boolean: The prefix_ns_boolean of this XmlItem.  # noqa: E501
-        :type: bool
+        :type prefix_ns_boolean: bool
         """
 
         self._prefix_ns_boolean = prefix_ns_boolean
@@ -775,7 +775,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_array: The prefix_ns_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_array: list[int]
         """
 
         self._prefix_ns_array = prefix_ns_array
@@ -796,7 +796,7 @@ class XmlItem(object):
 
 
         :param prefix_ns_wrapped_array: The prefix_ns_wrapped_array of this XmlItem.  # noqa: E501
-        :type: list[int]
+        :type prefix_ns_wrapped_array: list[int]
         """
 
         self._prefix_ns_wrapped_array = prefix_ns_wrapped_array
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
index cb2881b7ae8..7aebc264b07 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/another_fake_api.py
@@ -59,6 +59,7 @@ class AnotherFakeApi(object):
             To test special tags and operation ID starting with number  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.call_123_test_special_tags(client_client, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
index 25c8e40e525..65d9c2178a8 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/default_api.py
@@ -57,6 +57,7 @@ class DefaultApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.foo_get(async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
index 3c5de6178be..50c380e8607 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_api.py
@@ -62,6 +62,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.fake_health_get(async_req=True)
             >>> result = thread.get()
 
@@ -166,6 +167,7 @@ class FakeApi(object):
             Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -277,6 +279,7 @@ class FakeApi(object):
             Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -388,6 +391,7 @@ class FakeApi(object):
             Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -499,6 +503,7 @@ class FakeApi(object):
             Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
             >>> result = thread.get()
 
@@ -714,6 +719,7 @@ class FakeApi(object):
             For this test, the body for this request much reference a schema named `File`.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_body_with_file_schema(file_schema_test_class_file_schema_test_class, async_req=True)
             >>> result = thread.get()
 
@@ -829,6 +835,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_body_with_query_params(query, user_user, async_req=True)
             >>> result = thread.get()
 
@@ -953,6 +960,7 @@ class FakeApi(object):
             To test \"client\" model  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_client_model(client_client, async_req=True)
             >>> result = thread.get()
 
@@ -1073,6 +1081,7 @@ class FakeApi(object):
             Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
             >>> result = thread.get()
 
@@ -1326,6 +1335,7 @@ class FakeApi(object):
             To test enum parameters  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_enum_parameters(async_req=True)
             >>> result = thread.get()
 
@@ -1535,6 +1545,7 @@ class FakeApi(object):
             Fake endpoint to test group parameters (optional)  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
             >>> result = thread.get()
 
@@ -1686,6 +1697,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_inline_additional_properties(request_body, async_req=True)
             >>> result = thread.get()
 
@@ -1801,6 +1813,7 @@ class FakeApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_json_form_data(param, param2, async_req=True)
             >>> result = thread.get()
 
@@ -1930,6 +1943,7 @@ class FakeApi(object):
             To test the collection format in query parameters  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_query_parameter_collection_format(pipe, ioutil, http, url, context, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
index 2ed92b4d0f3..e22f47b416c 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/fake_classname_tags_123_api.py
@@ -59,6 +59,7 @@ class FakeClassnameTags123Api(object):
             To test class name in snake case  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.test_classname(client_client, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
index 9ccaf11c268..9ca9a64f8e2 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/pet_api.py
@@ -59,6 +59,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.add_pet(pet_pet, async_req=True)
             >>> result = thread.get()
 
@@ -180,6 +181,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_pet(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -302,6 +304,7 @@ class PetApi(object):
             Multiple status values can be provided with comma separated strings  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.find_pets_by_status(status, async_req=True)
             >>> result = thread.get()
 
@@ -430,6 +433,7 @@ class PetApi(object):
             Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.find_pets_by_tags(tags, async_req=True)
             >>> result = thread.get()
 
@@ -551,6 +555,7 @@ class PetApi(object):
             Returns a single pet  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_pet_by_id(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -669,6 +674,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_pet(pet_pet, async_req=True)
             >>> result = thread.get()
 
@@ -790,6 +796,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_pet_with_form(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -919,6 +926,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.upload_file(pet_id, async_req=True)
             >>> result = thread.get()
 
@@ -1051,6 +1059,7 @@ class PetApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
index 67648f5ee72..5bd88ecdca1 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/store_api.py
@@ -59,6 +59,7 @@ class StoreApi(object):
             For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_order(order_id, async_req=True)
             >>> result = thread.get()
 
@@ -172,6 +173,7 @@ class StoreApi(object):
             Returns a map of status codes to quantities  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_inventory(async_req=True)
             >>> result = thread.get()
 
@@ -279,6 +281,7 @@ class StoreApi(object):
             For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_order_by_id(order_id, async_req=True)
             >>> result = thread.get()
 
@@ -401,6 +404,7 @@ class StoreApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.place_order(order_order, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
index e5f5ffe886c..46f1fdf79ca 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api/user_api.py
@@ -59,6 +59,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_user(user_user, async_req=True)
             >>> result = thread.get()
 
@@ -173,6 +174,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_users_with_array_input(user_user, async_req=True)
             >>> result = thread.get()
 
@@ -287,6 +289,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.create_users_with_list_input(user_user, async_req=True)
             >>> result = thread.get()
 
@@ -402,6 +405,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.delete_user(username, async_req=True)
             >>> result = thread.get()
 
@@ -515,6 +519,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.get_user_by_name(username, async_req=True)
             >>> result = thread.get()
 
@@ -632,6 +637,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.login_user(username, password, async_req=True)
             >>> result = thread.get()
 
@@ -756,6 +762,7 @@ class UserApi(object):
 
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.logout_user(async_req=True)
             >>> result = thread.get()
 
@@ -860,6 +867,7 @@ class UserApi(object):
             This can only be done by the logged in user.  # noqa: E501
             This method makes a synchronous HTTP request by default. To make an
             asynchronous HTTP request, please pass async_req=True
+
             >>> thread = api.update_user(username, user_user, async_req=True)
             >>> result = thread.get()
 
diff --git a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
index 1edccecef67..7a7158d2c0b 100644
--- a/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
+++ b/samples/openapi3/client/petstore/python-experimental/petstore_api/api_client.py
@@ -279,6 +279,7 @@ class ApiClient(object):
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
         :param _check_type: boolean, whether to check the types of the data
             received from the server
+        :type _check_type: bool
 
         :return: deserialized object.
         """
@@ -338,22 +339,28 @@ class ApiClient(object):
             (float, none_type)
             ([int, none_type],)
             ({str: (bool, str, int, float, date, datetime, str, none_type)},)
-        :param files dict: key -> field name, value -> a list of open file
+        :param files: key -> field name, value -> a list of open file
             objects for `multipart/form-data`.
+        :type files: dict
         :param async_req bool: execute 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 collection_formats: dict of collection formats for path, query,
             header, and post parameters.
+        :type collection_formats: dict, 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 _check_type: boolean describing if the data back from the server
             should have its type checked.
+        :type _check_type: bool, optional
         :return:
             If async_req parameter is True,
             the request will be called asynchronously.
@@ -547,9 +554,9 @@ class ApiClient(object):
         :param headers: Header parameters dict to be updated.
         :param querys: Query parameters tuple list to be updated.
         :param auth_settings: Authentication setting identifiers list.
-        :resource_path: A string representation of the HTTP request resource path.
-        :method: A string representation of the HTTP request method.
-        :body: A object representing the body of the HTTP request.
+        :param resource_path: A string representation of the HTTP request resource path.
+        :param method: A string representation of the HTTP request method.
+        :param body: A object representing the body of the HTTP request.
             The object type is the return value of sanitize_for_serialization().
         """
         if not auth_settings:
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
index c92e1b4a209..9421b337d4b 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/another_fake_api.py
@@ -42,21 +42,26 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.call_123_test_special_tags_with_http_info(client, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class AnotherFakeApi(object):
         To test special tags and operation ID starting with number  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.call_123_test_special_tags_with_http_info(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
index e1a71f14293..a14b43c994c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/default_api.py
@@ -41,20 +41,24 @@ class DefaultApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.foo_get(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: InlineResponseDefault
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: InlineResponseDefault
         """
         kwargs['_return_http_data_only'] = True
         return self.foo_get_with_http_info(**kwargs)  # noqa: E501
@@ -64,22 +68,27 @@ class DefaultApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.foo_get_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(InlineResponseDefault, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(InlineResponseDefault, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
index 01f431fb430..49c9033aca2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py
@@ -41,20 +41,24 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.fake_health_get(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: HealthCheckResult
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: HealthCheckResult
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_health_get_with_http_info(**kwargs)  # noqa: E501
@@ -64,22 +68,27 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.fake_health_get_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(HealthCheckResult, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(HealthCheckResult, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -144,23 +153,30 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.fake_http_signature_test(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
-        :param str query_1: query parameter
-        :param str header_1: header parameter
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :param query_1: query parameter
+        :type query_1: str
+        :param header_1: header parameter
+        :type header_1: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_http_signature_test_with_http_info(pet, **kwargs)  # noqa: E501
@@ -170,25 +186,33 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.fake_http_signature_test_with_http_info(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
-        :param str query_1: query parameter
-        :param str header_1: header parameter
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :param query_1: query parameter
+        :type query_1: str
+        :param header_1: header parameter
+        :type header_1: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -267,21 +291,26 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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: bool
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: bool
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_boolean_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -292,23 +321,29 @@ class FakeApi(object):
         Test serialization of outer boolean types  # 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_outer_boolean_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param bool body: Input boolean as post body
+        :param body: Input boolean as post body
+        :type body: bool
+        :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.
-        :return: tuple(bool, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(bool, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -381,21 +416,26 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite outer_composite: Input composite as post body
+        :param outer_composite: Input composite as post body
+        :type outer_composite: OuterComposite
+        :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: OuterComposite
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: OuterComposite
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_composite_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -406,23 +446,29 @@ class FakeApi(object):
         Test serialization of object with outer number type  # 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_outer_composite_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param OuterComposite outer_composite: Input composite as post body
+        :param outer_composite: Input composite as post body
+        :type outer_composite: OuterComposite
+        :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.
-        :return: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(OuterComposite, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -495,21 +541,26 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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: float
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: float
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_number_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -520,23 +571,29 @@ class FakeApi(object):
         Test serialization of outer number types  # 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_outer_number_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float body: Input number as post body
+        :param body: Input number as post body
+        :type body: float
+        :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.
-        :return: tuple(float, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(float, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -609,21 +666,26 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.fake_outer_string_serialize_with_http_info(**kwargs)  # noqa: E501
@@ -634,23 +696,29 @@ class FakeApi(object):
         Test serialization of outer string types  # 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_outer_string_serialize_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str body: Input string as post body
+        :param body: Input string as post body
+        :type body: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -723,21 +791,26 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema(file_schema_test_class, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass file_schema_test_class: (required)
+        :param file_schema_test_class: (required)
+        :type file_schema_test_class: FileSchemaTestClass
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_file_schema_with_http_info(file_schema_test_class, **kwargs)  # noqa: E501
@@ -748,23 +821,29 @@ class FakeApi(object):
         For this test, the body for this request much reference a schema named `File`.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_file_schema_with_http_info(file_schema_test_class, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param FileSchemaTestClass file_schema_test_class: (required)
+        :param file_schema_test_class: (required)
+        :type file_schema_test_class: FileSchemaTestClass
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -836,22 +915,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params(query, user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User user: (required)
+        :param query: (required)
+        :type query: str
+        :param user: (required)
+        :type user: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_body_with_query_params_with_http_info(query, user, **kwargs)  # noqa: E501
@@ -861,24 +946,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_body_with_query_params_with_http_info(query, user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str query: (required)
-        :param User user: (required)
+        :param query: (required)
+        :type query: str
+        :param user: (required)
+        :type user: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -958,21 +1050,26 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_client_model_with_http_info(client, **kwargs)  # noqa: E501
@@ -983,23 +1080,29 @@ class FakeApi(object):
         To test \"client\" model  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_client_model_with_http_info(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -1076,34 +1179,52 @@ class FakeApi(object):
         Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, **kwargs)  # noqa: E501
@@ -1114,36 +1235,55 @@ class FakeApi(object):
         Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트   # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_endpoint_parameters_with_http_info(number, double, pattern_without_delimiter, byte, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param float number: None (required)
-        :param float double: None (required)
-        :param str pattern_without_delimiter: None (required)
-        :param str byte: None (required)
-        :param int integer: None
-        :param int int32: None
-        :param int int64: None
-        :param float float: None
-        :param str string: None
-        :param file binary: None
-        :param date date: None
-        :param datetime date_time: None
-        :param str password: None
-        :param str param_callback: None
+        :param number: None (required)
+        :type number: float
+        :param double: None (required)
+        :type double: float
+        :param pattern_without_delimiter: None (required)
+        :type pattern_without_delimiter: str
+        :param byte: None (required)
+        :type byte: str
+        :param integer: None
+        :type integer: int
+        :param int32: None
+        :type int32: int
+        :param int64: None
+        :type int64: int
+        :param float: None
+        :type float: float
+        :param string: None
+        :type string: str
+        :param binary: None
+        :type binary: file
+        :param date: None
+        :type date: date
+        :param date_time: None
+        :type date_time: datetime
+        :param password: None
+        :type password: str
+        :param param_callback: None
+        :type param_callback: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1295,28 +1435,40 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_enum_parameters_with_http_info(**kwargs)  # noqa: E501
@@ -1327,30 +1479,43 @@ class FakeApi(object):
         To test enum parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_enum_parameters_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] enum_header_string_array: Header parameter enum test (string array)
-        :param str enum_header_string: Header parameter enum test (string)
-        :param list[str] enum_query_string_array: Query parameter enum test (string array)
-        :param str enum_query_string: Query parameter enum test (string)
-        :param int enum_query_integer: Query parameter enum test (double)
-        :param float enum_query_double: Query parameter enum test (double)
-        :param list[str] enum_form_string_array: Form parameter enum test (string array)
-        :param str enum_form_string: Form parameter enum test (string)
+        :param enum_header_string_array: Header parameter enum test (string array)
+        :type enum_header_string_array: list[str]
+        :param enum_header_string: Header parameter enum test (string)
+        :type enum_header_string: str
+        :param enum_query_string_array: Query parameter enum test (string array)
+        :type enum_query_string_array: list[str]
+        :param enum_query_string: Query parameter enum test (string)
+        :type enum_query_string: str
+        :param enum_query_integer: Query parameter enum test (double)
+        :type enum_query_integer: int
+        :param enum_query_double: Query parameter enum test (double)
+        :type enum_query_double: float
+        :param enum_form_string_array: Form parameter enum test (string array)
+        :type enum_form_string_array: list[str]
+        :param enum_form_string: Form parameter enum test (string)
+        :type enum_form_string: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1443,26 +1608,36 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, **kwargs)  # noqa: E501
@@ -1473,28 +1648,39 @@ class FakeApi(object):
         Fake endpoint to test group parameters (optional)  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_group_parameters_with_http_info(required_string_group, required_boolean_group, required_int64_group, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int required_string_group: Required String in group parameters (required)
-        :param bool required_boolean_group: Required Boolean in group parameters (required)
-        :param int required_int64_group: Required Integer in group parameters (required)
-        :param int string_group: String in group parameters
-        :param bool boolean_group: Boolean in group parameters
-        :param int int64_group: Integer in group parameters
+        :param required_string_group: Required String in group parameters (required)
+        :type required_string_group: int
+        :param required_boolean_group: Required Boolean in group parameters (required)
+        :type required_boolean_group: bool
+        :param required_int64_group: Required Integer in group parameters (required)
+        :type required_int64_group: int
+        :param string_group: String in group parameters
+        :type string_group: int
+        :param boolean_group: Boolean in group parameters
+        :type boolean_group: bool
+        :param int64_group: Integer in group parameters
+        :type int64_group: int
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1585,21 +1771,26 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties(request_body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) request_body: request body (required)
+        :param request_body: request body (required)
+        :type request_body: dict(str, str)
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_inline_additional_properties_with_http_info(request_body, **kwargs)  # noqa: E501
@@ -1609,23 +1800,29 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_inline_additional_properties_with_http_info(request_body, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param dict(str, str) request_body: request body (required)
+        :param request_body: request body (required)
+        :type request_body: dict(str, str)
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1697,22 +1894,28 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_json_form_data_with_http_info(param, param2, **kwargs)  # noqa: E501
@@ -1722,24 +1925,31 @@ class FakeApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_json_form_data_with_http_info(param, param2, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str param: field1 (required)
-        :param str param2: field2 (required)
+        :param param: field1 (required)
+        :type param: str
+        :param param2: field2 (required)
+        :type param2: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -1819,25 +2029,34 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, **kwargs)  # noqa: E501
@@ -1848,27 +2067,37 @@ class FakeApi(object):
         To test the collection format in query parameters  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_query_parameter_collection_format_with_http_info(pipe, ioutil, http, url, context, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] pipe: (required)
-        :param list[str] ioutil: (required)
-        :param list[str] http: (required)
-        :param list[str] url: (required)
-        :param list[str] context: (required)
+        :param pipe: (required)
+        :type pipe: list[str]
+        :param ioutil: (required)
+        :type ioutil: list[str]
+        :param http: (required)
+        :type http: list[str]
+        :param url: (required)
+        :type url: list[str]
+        :param context: (required)
+        :type context: list[str]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
index 0fd2b6274ca..19d22cd10d6 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/fake_classname_tags_123_api.py
@@ -42,21 +42,26 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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: Client
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Client
         """
         kwargs['_return_http_data_only'] = True
         return self.test_classname_with_http_info(client, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class FakeClassnameTags123Api(object):
         To test class name in snake case  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.test_classname_with_http_info(client, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Client client: client model (required)
+        :param client: client model (required)
+        :type client: Client
+        :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.
-        :return: tuple(Client, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Client, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
index bf25e077aec..8c8f5d93671 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/pet_api.py
@@ -41,21 +41,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.add_pet_with_http_info(pet, **kwargs)  # noqa: E501
@@ -65,23 +70,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.add_pet_with_http_info(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_hosts = [
@@ -167,22 +178,28 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_pet_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -192,24 +209,31 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_pet_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: Pet id to delete (required)
-        :param str api_key:
+        :param pet_id: Pet id to delete (required)
+        :type pet_id: int
+        :param api_key:
+        :type api_key: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -281,21 +305,26 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_status_with_http_info(status, **kwargs)  # noqa: E501
@@ -306,23 +335,29 @@ class PetApi(object):
         Multiple status values can be provided with comma separated strings  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_status_with_http_info(status, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] status: Status values that need to be considered for filter (required)
+        :param status: Status values that need to be considered for filter (required)
+        :type status: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -396,21 +431,26 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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: list[Pet]
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: list[Pet]
         """
         kwargs['_return_http_data_only'] = True
         return self.find_pets_by_tags_with_http_info(tags, **kwargs)  # noqa: E501
@@ -421,23 +461,29 @@ class PetApi(object):
         Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.find_pets_by_tags_with_http_info(tags, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[str] tags: Tags to filter by (required)
+        :param tags: Tags to filter by (required)
+        :type tags: list[str]
+        :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.
-        :return: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(list[Pet], status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -511,21 +557,26 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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: Pet
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Pet
         """
         kwargs['_return_http_data_only'] = True
         return self.get_pet_by_id_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -536,23 +587,29 @@ class PetApi(object):
         Returns a single pet  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_pet_by_id_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to return (required)
+        :param pet_id: ID of pet to return (required)
+        :type pet_id: int
+        :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.
-        :return: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Pet, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -624,21 +681,26 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_http_info(pet, **kwargs)  # noqa: E501
@@ -648,23 +710,29 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_http_info(pet, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Pet pet: Pet object that needs to be added to the store (required)
+        :param pet: Pet object that needs to be added to the store (required)
+        :type pet: Pet
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_hosts = [
@@ -750,23 +818,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_pet_with_form_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -776,25 +851,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_pet_with_form_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet that needs to be updated (required)
-        :param str name: Updated name of the pet
-        :param str status: Updated status of the pet
+        :param pet_id: ID of pet that needs to be updated (required)
+        :type pet_id: int
+        :param name: Updated name of the pet
+        :type name: str
+        :param status: Updated status of the pet
+        :type status: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -872,23 +955,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_http_info(pet_id, **kwargs)  # noqa: E501
@@ -898,25 +988,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_http_info(pet_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param str additional_metadata: Additional data to pass to server
-        :param file file: file to upload
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :param file: file to upload
+        :type file: file
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -998,23 +1096,30 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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: ApiResponse
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: ApiResponse
         """
         kwargs['_return_http_data_only'] = True
         return self.upload_file_with_required_file_with_http_info(pet_id, required_file, **kwargs)  # noqa: E501
@@ -1024,25 +1129,33 @@ class PetApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.upload_file_with_required_file_with_http_info(pet_id, required_file, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int pet_id: ID of pet to update (required)
-        :param file required_file: file to upload (required)
-        :param str additional_metadata: Additional data to pass to server
+        :param pet_id: ID of pet to update (required)
+        :type pet_id: int
+        :param required_file: file to upload (required)
+        :type required_file: file
+        :param additional_metadata: Additional data to pass to server
+        :type additional_metadata: str
+        :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.
-        :return: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(ApiResponse, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
index a5d1ddc0d3d..2b35556ba81 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/store_api.py
@@ -42,21 +42,26 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_order_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class StoreApi(object):
         For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_order_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str order_id: ID of the order that needs to be deleted (required)
+        :param order_id: ID of the order that needs to be deleted (required)
+        :type order_id: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -152,20 +163,24 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: dict(str, int)
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: dict(str, int)
         """
         kwargs['_return_http_data_only'] = True
         return self.get_inventory_with_http_info(**kwargs)  # noqa: E501
@@ -176,22 +191,27 @@ class StoreApi(object):
         Returns a map of status codes to quantities  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_inventory_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(dict(str, int), status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -257,21 +277,26 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.get_order_by_id_with_http_info(order_id, **kwargs)  # noqa: E501
@@ -282,23 +307,29 @@ class StoreApi(object):
         For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_order_by_id_with_http_info(order_id, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param int order_id: ID of pet that needs to be fetched (required)
+        :param order_id: ID of pet that needs to be fetched (required)
+        :type order_id: int
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -374,21 +405,26 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order(order, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order order: order placed for purchasing the pet (required)
+        :param order: order placed for purchasing the pet (required)
+        :type order: Order
+        :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: Order
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: Order
         """
         kwargs['_return_http_data_only'] = True
         return self.place_order_with_http_info(order, **kwargs)  # noqa: E501
@@ -398,23 +434,29 @@ class StoreApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.place_order_with_http_info(order, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param Order order: order placed for purchasing the pet (required)
+        :param order: order placed for purchasing the pet (required)
+        :type order: Order
+        :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.
-        :return: tuple(Order, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(Order, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
index c1357adf999..38d0b4ee5b9 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/api/user_api.py
@@ -42,21 +42,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User user: Created user object (required)
+        :param user: Created user object (required)
+        :type user: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_user_with_http_info(user, **kwargs)  # noqa: E501
@@ -67,23 +72,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_user_with_http_info(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param User user: Created user object (required)
+        :param user: Created user object (required)
+        :type user: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -155,21 +166,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] user: List of user object (required)
+        :param user: List of user object (required)
+        :type user: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_array_input_with_http_info(user, **kwargs)  # noqa: E501
@@ -179,23 +195,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_array_input_with_http_info(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] user: List of user object (required)
+        :param user: List of user object (required)
+        :type user: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -267,21 +289,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] user: List of user object (required)
+        :param user: List of user object (required)
+        :type user: list[User]
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.create_users_with_list_input_with_http_info(user, **kwargs)  # noqa: E501
@@ -291,23 +318,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.create_users_with_list_input_with_http_info(user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param list[User] user: List of user object (required)
+        :param user: List of user object (required)
+        :type user: list[User]
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -380,21 +413,26 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.delete_user_with_http_info(username, **kwargs)  # noqa: E501
@@ -405,23 +443,29 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.delete_user_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be deleted (required)
+        :param username: The name that needs to be deleted (required)
+        :type username: str
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -489,21 +533,26 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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: User
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: User
         """
         kwargs['_return_http_data_only'] = True
         return self.get_user_by_name_with_http_info(username, **kwargs)  # noqa: E501
@@ -513,23 +562,29 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.get_user_by_name_with_http_info(username, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The name that needs to be fetched. Use user1 for testing. (required)
+        :param username: The name that needs to be fetched. Use user1 for testing. (required)
+        :type username: str
+        :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.
-        :return: tuple(User, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(User, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -601,22 +656,28 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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: str
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: str
         """
         kwargs['_return_http_data_only'] = True
         return self.login_user_with_http_info(username, password, **kwargs)  # noqa: E501
@@ -626,24 +687,31 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.login_user_with_http_info(username, password, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: The user name for login (required)
-        :param str password: The password for login in clear text (required)
+        :param username: The user name for login (required)
+        :type username: str
+        :param password: The password for login in clear text (required)
+        :type password: str
+        :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.
-        :return: tuple(str, status_code(int), headers(HTTPHeaderDict))
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: tuple(str, status_code(int), headers(HTTPHeaderDict))
         """
 
         local_var_params = locals()
@@ -722,20 +790,24 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.logout_user_with_http_info(**kwargs)  # noqa: E501
@@ -745,22 +817,27 @@ class UserApi(object):
 
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.logout_user_with_http_info(async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
@@ -822,22 +899,28 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user(username, user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User user: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param user: Updated user object (required)
+        :type user: User
+        :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: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
         kwargs['_return_http_data_only'] = True
         return self.update_user_with_http_info(username, user, **kwargs)  # noqa: E501
@@ -848,24 +931,31 @@ class UserApi(object):
         This can only be done by the logged in user.  # noqa: E501
         This method makes a synchronous HTTP request by default. To make an
         asynchronous HTTP request, please pass async_req=True
+
         >>> thread = api.update_user_with_http_info(username, user, async_req=True)
         >>> result = thread.get()
 
-        :param async_req bool: execute request asynchronously
-        :param str username: name that need to be deleted (required)
-        :param User user: Updated user object (required)
+        :param username: name that need to be deleted (required)
+        :type username: str
+        :param user: Updated user object (required)
+        :type user: User
+        :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.
-        :return: None
+        :return: Returns the result object.
                  If the method is called asynchronously,
                  returns the request thread.
+        :rtype: None
         """
 
         local_var_params = locals()
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py
index 9da151ae829..2e5d49aa256 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/additional_properties_class.py
@@ -73,7 +73,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_property: The map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, str)
+        :type map_property: dict(str, str)
         """
 
         self._map_property = map_property
@@ -94,7 +94,7 @@ class AdditionalPropertiesClass(object):
 
 
         :param map_of_map_property: The map_of_map_property of this AdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_of_map_property: dict(str, dict(str, str))
         """
 
         self._map_of_map_property = map_of_map_property
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/animal.py b/samples/openapi3/client/petstore/python/petstore_api/models/animal.py
index 65cef1a6088..4c233ad4a88 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/animal.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/animal.py
@@ -77,7 +77,7 @@ class Animal(object):
 
 
         :param class_name: The class_name of this Animal.  # noqa: E501
-        :type: str
+        :type class_name: str
         """
         if self.local_vars_configuration.client_side_validation and class_name is None:  # noqa: E501
             raise ValueError("Invalid value for `class_name`, must not be `None`")  # noqa: E501
@@ -100,7 +100,7 @@ class Animal(object):
 
 
         :param color: The color of this Animal.  # noqa: E501
-        :type: str
+        :type color: str
         """
 
         self._color = color
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/api_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/api_response.py
index 24e80d02aea..8cb64673c35 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/api_response.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/api_response.py
@@ -78,7 +78,7 @@ class ApiResponse(object):
 
 
         :param code: The code of this ApiResponse.  # noqa: E501
-        :type: int
+        :type code: int
         """
 
         self._code = code
@@ -99,7 +99,7 @@ class ApiResponse(object):
 
 
         :param type: The type of this ApiResponse.  # noqa: E501
-        :type: str
+        :type type: str
         """
 
         self._type = type
@@ -120,7 +120,7 @@ class ApiResponse(object):
 
 
         :param message: The message of this ApiResponse.  # noqa: E501
-        :type: str
+        :type message: str
         """
 
         self._message = message
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
index 1f654452077..41a689c534a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfArrayOfNumberOnly(object):
 
 
         :param array_array_number: The array_array_number of this ArrayOfArrayOfNumberOnly.  # noqa: E501
-        :type: list[list[float]]
+        :type array_array_number: list[list[float]]
         """
 
         self._array_array_number = array_array_number
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py
index 27ba1f58e31..ddb7f7c7abe 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_of_number_only.py
@@ -68,7 +68,7 @@ class ArrayOfNumberOnly(object):
 
 
         :param array_number: The array_number of this ArrayOfNumberOnly.  # noqa: E501
-        :type: list[float]
+        :type array_number: list[float]
         """
 
         self._array_number = array_number
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py
index f34a372f6f3..e8e5c378f98 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/array_test.py
@@ -78,7 +78,7 @@ class ArrayTest(object):
 
 
         :param array_of_string: The array_of_string of this ArrayTest.  # noqa: E501
-        :type: list[str]
+        :type array_of_string: list[str]
         """
 
         self._array_of_string = array_of_string
@@ -99,7 +99,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_integer: The array_array_of_integer of this ArrayTest.  # noqa: E501
-        :type: list[list[int]]
+        :type array_array_of_integer: list[list[int]]
         """
 
         self._array_array_of_integer = array_array_of_integer
@@ -120,7 +120,7 @@ class ArrayTest(object):
 
 
         :param array_array_of_model: The array_array_of_model of this ArrayTest.  # noqa: E501
-        :type: list[list[ReadOnlyFirst]]
+        :type array_array_of_model: list[list[ReadOnlyFirst]]
         """
 
         self._array_array_of_model = array_array_of_model
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py b/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py
index cef34c5f6dc..967d324a0ab 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/capitalization.py
@@ -93,7 +93,7 @@ class Capitalization(object):
 
 
         :param small_camel: The small_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_camel: str
         """
 
         self._small_camel = small_camel
@@ -114,7 +114,7 @@ class Capitalization(object):
 
 
         :param capital_camel: The capital_camel of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_camel: str
         """
 
         self._capital_camel = capital_camel
@@ -135,7 +135,7 @@ class Capitalization(object):
 
 
         :param small_snake: The small_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type small_snake: str
         """
 
         self._small_snake = small_snake
@@ -156,7 +156,7 @@ class Capitalization(object):
 
 
         :param capital_snake: The capital_snake of this Capitalization.  # noqa: E501
-        :type: str
+        :type capital_snake: str
         """
 
         self._capital_snake = capital_snake
@@ -177,7 +177,7 @@ class Capitalization(object):
 
 
         :param sca_eth_flow_points: The sca_eth_flow_points of this Capitalization.  # noqa: E501
-        :type: str
+        :type sca_eth_flow_points: str
         """
 
         self._sca_eth_flow_points = sca_eth_flow_points
@@ -200,7 +200,7 @@ class Capitalization(object):
         Name of the pet   # noqa: E501
 
         :param att_name: The att_name of this Capitalization.  # noqa: E501
-        :type: str
+        :type att_name: str
         """
 
         self._att_name = att_name
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/cat.py b/samples/openapi3/client/petstore/python/petstore_api/models/cat.py
index e39c1c82508..b3b0d868c7f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/cat.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/cat.py
@@ -68,7 +68,7 @@ class Cat(object):
 
 
         :param declawed: The declawed of this Cat.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/cat_all_of.py b/samples/openapi3/client/petstore/python/petstore_api/models/cat_all_of.py
index 7e90fab9348..f573a04636c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/cat_all_of.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/cat_all_of.py
@@ -68,7 +68,7 @@ class CatAllOf(object):
 
 
         :param declawed: The declawed of this CatAllOf.  # noqa: E501
-        :type: bool
+        :type declawed: bool
         """
 
         self._declawed = declawed
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/category.py b/samples/openapi3/client/petstore/python/petstore_api/models/category.py
index b47c148953e..11a7bf85f3a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/category.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/category.py
@@ -72,7 +72,7 @@ class Category(object):
 
 
         :param id: The id of this Category.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -93,7 +93,7 @@ class Category(object):
 
 
         :param name: The name of this Category.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py b/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py
index ef6060ffa70..aac505ea064 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/class_model.py
@@ -68,7 +68,7 @@ class ClassModel(object):
 
 
         :param _class: The _class of this ClassModel.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/client.py b/samples/openapi3/client/petstore/python/petstore_api/models/client.py
index ee5dbf1c43a..2006350b210 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/client.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/client.py
@@ -68,7 +68,7 @@ class Client(object):
 
 
         :param client: The client of this Client.  # noqa: E501
-        :type: str
+        :type client: str
         """
 
         self._client = client
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/dog.py b/samples/openapi3/client/petstore/python/petstore_api/models/dog.py
index eacb63eedb0..fb9024d0bb7 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/dog.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/dog.py
@@ -68,7 +68,7 @@ class Dog(object):
 
 
         :param breed: The breed of this Dog.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/dog_all_of.py b/samples/openapi3/client/petstore/python/petstore_api/models/dog_all_of.py
index 48e04855708..5943ba900dd 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/dog_all_of.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/dog_all_of.py
@@ -68,7 +68,7 @@ class DogAllOf(object):
 
 
         :param breed: The breed of this DogAllOf.  # noqa: E501
-        :type: str
+        :type breed: str
         """
 
         self._breed = breed
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py
index 819ff322157..ae2ea1d4251 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_arrays.py
@@ -73,7 +73,7 @@ class EnumArrays(object):
 
 
         :param just_symbol: The just_symbol of this EnumArrays.  # noqa: E501
-        :type: str
+        :type just_symbol: str
         """
         allowed_values = [">=", "$"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and just_symbol not in allowed_values:  # noqa: E501
@@ -100,7 +100,7 @@ class EnumArrays(object):
 
 
         :param array_enum: The array_enum of this EnumArrays.  # noqa: E501
-        :type: list[str]
+        :type array_enum: list[str]
         """
         allowed_values = ["fish", "crab"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
index 24ed1b462d0..8af01fd85cc 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
@@ -101,7 +101,7 @@ class EnumTest(object):
 
 
         :param enum_string: The enum_string of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string: str
         """
         allowed_values = ["UPPER", "lower", ""]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_string not in allowed_values:  # noqa: E501
@@ -128,7 +128,7 @@ class EnumTest(object):
 
 
         :param enum_string_required: The enum_string_required of this EnumTest.  # noqa: E501
-        :type: str
+        :type enum_string_required: str
         """
         if self.local_vars_configuration.client_side_validation and enum_string_required is None:  # noqa: E501
             raise ValueError("Invalid value for `enum_string_required`, must not be `None`")  # noqa: E501
@@ -157,7 +157,7 @@ class EnumTest(object):
 
 
         :param enum_integer: The enum_integer of this EnumTest.  # noqa: E501
-        :type: int
+        :type enum_integer: int
         """
         allowed_values = [1, -1]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_integer not in allowed_values:  # noqa: E501
@@ -184,7 +184,7 @@ class EnumTest(object):
 
 
         :param enum_number: The enum_number of this EnumTest.  # noqa: E501
-        :type: float
+        :type enum_number: float
         """
         allowed_values = [1.1, -1.2]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_number not in allowed_values:  # noqa: E501
@@ -211,7 +211,7 @@ class EnumTest(object):
 
 
         :param outer_enum: The outer_enum of this EnumTest.  # noqa: E501
-        :type: OuterEnum
+        :type outer_enum: OuterEnum
         """
 
         self._outer_enum = outer_enum
@@ -232,7 +232,7 @@ class EnumTest(object):
 
 
         :param outer_enum_integer: The outer_enum_integer of this EnumTest.  # noqa: E501
-        :type: OuterEnumInteger
+        :type outer_enum_integer: OuterEnumInteger
         """
 
         self._outer_enum_integer = outer_enum_integer
@@ -253,7 +253,7 @@ class EnumTest(object):
 
 
         :param outer_enum_default_value: The outer_enum_default_value of this EnumTest.  # noqa: E501
-        :type: OuterEnumDefaultValue
+        :type outer_enum_default_value: OuterEnumDefaultValue
         """
 
         self._outer_enum_default_value = outer_enum_default_value
@@ -274,7 +274,7 @@ class EnumTest(object):
 
 
         :param outer_enum_integer_default_value: The outer_enum_integer_default_value of this EnumTest.  # noqa: E501
-        :type: OuterEnumIntegerDefaultValue
+        :type outer_enum_integer_default_value: OuterEnumIntegerDefaultValue
         """
 
         self._outer_enum_integer_default_value = outer_enum_integer_default_value
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/file.py b/samples/openapi3/client/petstore/python/petstore_api/models/file.py
index 282df2957e6..4fb5c31762e 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/file.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/file.py
@@ -70,7 +70,7 @@ class File(object):
         Test capitalization  # noqa: E501
 
         :param source_uri: The source_uri of this File.  # noqa: E501
-        :type: str
+        :type source_uri: str
         """
 
         self._source_uri = source_uri
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py
index de7f865b47e..2f2d44a7b33 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/file_schema_test_class.py
@@ -73,7 +73,7 @@ class FileSchemaTestClass(object):
 
 
         :param file: The file of this FileSchemaTestClass.  # noqa: E501
-        :type: File
+        :type file: File
         """
 
         self._file = file
@@ -94,7 +94,7 @@ class FileSchemaTestClass(object):
 
 
         :param files: The files of this FileSchemaTestClass.  # noqa: E501
-        :type: list[File]
+        :type files: list[File]
         """
 
         self._files = files
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/foo.py b/samples/openapi3/client/petstore/python/petstore_api/models/foo.py
index 0a98b8837ca..f06272faa70 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/foo.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/foo.py
@@ -68,7 +68,7 @@ class Foo(object):
 
 
         :param bar: The bar of this Foo.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py
index 60e64039be5..f6d90fb0d58 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/format_test.py
@@ -134,7 +134,7 @@ class FormatTest(object):
 
 
         :param integer: The integer of this FormatTest.  # noqa: E501
-        :type: int
+        :type integer: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 integer is not None and integer > 100):  # noqa: E501
@@ -161,7 +161,7 @@ class FormatTest(object):
 
 
         :param int32: The int32 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int32: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 int32 is not None and int32 > 200):  # noqa: E501
@@ -188,7 +188,7 @@ class FormatTest(object):
 
 
         :param int64: The int64 of this FormatTest.  # noqa: E501
-        :type: int
+        :type int64: int
         """
 
         self._int64 = int64
@@ -209,7 +209,7 @@ class FormatTest(object):
 
 
         :param number: The number of this FormatTest.  # noqa: E501
-        :type: float
+        :type number: float
         """
         if self.local_vars_configuration.client_side_validation and number is None:  # noqa: E501
             raise ValueError("Invalid value for `number`, must not be `None`")  # noqa: E501
@@ -238,7 +238,7 @@ class FormatTest(object):
 
 
         :param float: The float of this FormatTest.  # noqa: E501
-        :type: float
+        :type float: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 float is not None and float > 987.6):  # noqa: E501
@@ -265,7 +265,7 @@ class FormatTest(object):
 
 
         :param double: The double of this FormatTest.  # noqa: E501
-        :type: float
+        :type double: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 double is not None and double > 123.4):  # noqa: E501
@@ -292,7 +292,7 @@ class FormatTest(object):
 
 
         :param string: The string of this FormatTest.  # noqa: E501
-        :type: str
+        :type string: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 string is not None and not re.search(r'[a-z]', string, flags=re.IGNORECASE)):  # noqa: E501
@@ -316,7 +316,7 @@ class FormatTest(object):
 
 
         :param byte: The byte of this FormatTest.  # noqa: E501
-        :type: str
+        :type byte: str
         """
         if self.local_vars_configuration.client_side_validation and byte is None:  # noqa: E501
             raise ValueError("Invalid value for `byte`, must not be `None`")  # noqa: E501
@@ -339,7 +339,7 @@ class FormatTest(object):
 
 
         :param binary: The binary of this FormatTest.  # noqa: E501
-        :type: file
+        :type binary: file
         """
 
         self._binary = binary
@@ -360,7 +360,7 @@ class FormatTest(object):
 
 
         :param date: The date of this FormatTest.  # noqa: E501
-        :type: date
+        :type date: date
         """
         if self.local_vars_configuration.client_side_validation and date is None:  # noqa: E501
             raise ValueError("Invalid value for `date`, must not be `None`")  # noqa: E501
@@ -383,7 +383,7 @@ class FormatTest(object):
 
 
         :param date_time: The date_time of this FormatTest.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -404,7 +404,7 @@ class FormatTest(object):
 
 
         :param uuid: The uuid of this FormatTest.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -425,7 +425,7 @@ class FormatTest(object):
 
 
         :param password: The password of this FormatTest.  # noqa: E501
-        :type: str
+        :type password: str
         """
         if self.local_vars_configuration.client_side_validation and password is None:  # noqa: E501
             raise ValueError("Invalid value for `password`, must not be `None`")  # noqa: E501
@@ -456,7 +456,7 @@ class FormatTest(object):
         A string that is a 10 digit number. Can have leading zeros.  # noqa: E501
 
         :param pattern_with_digits: The pattern_with_digits of this FormatTest.  # noqa: E501
-        :type: str
+        :type pattern_with_digits: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 pattern_with_digits is not None and not re.search(r'^\d{10}$', pattern_with_digits)):  # noqa: E501
@@ -482,7 +482,7 @@ class FormatTest(object):
         A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.  # noqa: E501
 
         :param pattern_with_digits_and_delimiter: The pattern_with_digits_and_delimiter of this FormatTest.  # noqa: E501
-        :type: str
+        :type pattern_with_digits_and_delimiter: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 pattern_with_digits_and_delimiter is not None and not re.search(r'^image_\d{1,3}$', pattern_with_digits_and_delimiter, flags=re.IGNORECASE)):  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py
index 5fc2f8a9ebd..fa496519ecb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/has_only_read_only.py
@@ -73,7 +73,7 @@ class HasOnlyReadOnly(object):
 
 
         :param bar: The bar of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class HasOnlyReadOnly(object):
 
 
         :param foo: The foo of this HasOnlyReadOnly.  # noqa: E501
-        :type: str
+        :type foo: str
         """
 
         self._foo = foo
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py b/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py
index 7c62a43ef7a..2c429088a49 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/health_check_result.py
@@ -67,7 +67,7 @@ class HealthCheckResult(object):
 
 
         :param nullable_message: The nullable_message of this HealthCheckResult.  # noqa: E501
-        :type: str
+        :type nullable_message: str
         """
 
         self._nullable_message = nullable_message
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object.py
index 0ac70b16a32..ecd4978ff4f 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object.py
@@ -75,7 +75,7 @@ class InlineObject(object):
         Updated name of the pet  # noqa: E501
 
         :param name: The name of this InlineObject.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
@@ -98,7 +98,7 @@ class InlineObject(object):
         Updated status of the pet  # noqa: E501
 
         :param status: The status of this InlineObject.  # noqa: E501
-        :type: str
+        :type status: str
         """
 
         self._status = status
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object1.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object1.py
index 300af445d03..0e5ebe6b9ef 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object1.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object1.py
@@ -75,7 +75,7 @@ class InlineObject1(object):
         Additional data to pass to server  # noqa: E501
 
         :param additional_metadata: The additional_metadata of this InlineObject1.  # noqa: E501
-        :type: str
+        :type additional_metadata: str
         """
 
         self._additional_metadata = additional_metadata
@@ -98,7 +98,7 @@ class InlineObject1(object):
         file to upload  # noqa: E501
 
         :param file: The file of this InlineObject1.  # noqa: E501
-        :type: file
+        :type file: file
         """
 
         self._file = file
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object2.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object2.py
index f904d0a24d5..92c5ed5d908 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object2.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object2.py
@@ -75,7 +75,7 @@ class InlineObject2(object):
         Form parameter enum test (string array)  # noqa: E501
 
         :param enum_form_string_array: The enum_form_string_array of this InlineObject2.  # noqa: E501
-        :type: list[str]
+        :type enum_form_string_array: list[str]
         """
         allowed_values = [">", "$"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
@@ -106,7 +106,7 @@ class InlineObject2(object):
         Form parameter enum test (string)  # noqa: E501
 
         :param enum_form_string: The enum_form_string of this InlineObject2.  # noqa: E501
-        :type: str
+        :type enum_form_string: str
         """
         allowed_values = ["_abc", "-efg", "(xyz)"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and enum_form_string not in allowed_values:  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object3.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object3.py
index 9870a922b2b..5c38b748031 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object3.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object3.py
@@ -131,7 +131,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param integer: The integer of this InlineObject3.  # noqa: E501
-        :type: int
+        :type integer: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 integer is not None and integer > 100):  # noqa: E501
@@ -160,7 +160,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param int32: The int32 of this InlineObject3.  # noqa: E501
-        :type: int
+        :type int32: int
         """
         if (self.local_vars_configuration.client_side_validation and
                 int32 is not None and int32 > 200):  # noqa: E501
@@ -189,7 +189,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param int64: The int64 of this InlineObject3.  # noqa: E501
-        :type: int
+        :type int64: int
         """
 
         self._int64 = int64
@@ -212,7 +212,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param number: The number of this InlineObject3.  # noqa: E501
-        :type: float
+        :type number: float
         """
         if self.local_vars_configuration.client_side_validation and number is None:  # noqa: E501
             raise ValueError("Invalid value for `number`, must not be `None`")  # noqa: E501
@@ -243,7 +243,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param float: The float of this InlineObject3.  # noqa: E501
-        :type: float
+        :type float: float
         """
         if (self.local_vars_configuration.client_side_validation and
                 float is not None and float > 987.6):  # noqa: E501
@@ -269,7 +269,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param double: The double of this InlineObject3.  # noqa: E501
-        :type: float
+        :type double: float
         """
         if self.local_vars_configuration.client_side_validation and double is None:  # noqa: E501
             raise ValueError("Invalid value for `double`, must not be `None`")  # noqa: E501
@@ -300,7 +300,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param string: The string of this InlineObject3.  # noqa: E501
-        :type: str
+        :type string: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 string is not None and not re.search(r'[a-z]', string, flags=re.IGNORECASE)):  # noqa: E501
@@ -326,7 +326,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param pattern_without_delimiter: The pattern_without_delimiter of this InlineObject3.  # noqa: E501
-        :type: str
+        :type pattern_without_delimiter: str
         """
         if self.local_vars_configuration.client_side_validation and pattern_without_delimiter is None:  # noqa: E501
             raise ValueError("Invalid value for `pattern_without_delimiter`, must not be `None`")  # noqa: E501
@@ -354,7 +354,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param byte: The byte of this InlineObject3.  # noqa: E501
-        :type: str
+        :type byte: str
         """
         if self.local_vars_configuration.client_side_validation and byte is None:  # noqa: E501
             raise ValueError("Invalid value for `byte`, must not be `None`")  # noqa: E501
@@ -379,7 +379,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param binary: The binary of this InlineObject3.  # noqa: E501
-        :type: file
+        :type binary: file
         """
 
         self._binary = binary
@@ -402,7 +402,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param date: The date of this InlineObject3.  # noqa: E501
-        :type: date
+        :type date: date
         """
 
         self._date = date
@@ -425,7 +425,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param date_time: The date_time of this InlineObject3.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -448,7 +448,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param password: The password of this InlineObject3.  # noqa: E501
-        :type: str
+        :type password: str
         """
         if (self.local_vars_configuration.client_side_validation and
                 password is not None and len(password) > 64):
@@ -477,7 +477,7 @@ class InlineObject3(object):
         None  # noqa: E501
 
         :param callback: The callback of this InlineObject3.  # noqa: E501
-        :type: str
+        :type callback: str
         """
 
         self._callback = callback
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object4.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object4.py
index a4ecb978d0a..1492d942a64 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object4.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object4.py
@@ -73,7 +73,7 @@ class InlineObject4(object):
         field1  # noqa: E501
 
         :param param: The param of this InlineObject4.  # noqa: E501
-        :type: str
+        :type param: str
         """
         if self.local_vars_configuration.client_side_validation and param is None:  # noqa: E501
             raise ValueError("Invalid value for `param`, must not be `None`")  # noqa: E501
@@ -98,7 +98,7 @@ class InlineObject4(object):
         field2  # noqa: E501
 
         :param param2: The param2 of this InlineObject4.  # noqa: E501
-        :type: str
+        :type param2: str
         """
         if self.local_vars_configuration.client_side_validation and param2 is None:  # noqa: E501
             raise ValueError("Invalid value for `param2`, must not be `None`")  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object5.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object5.py
index 2badeb2274c..d8ed83d9680 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_object5.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_object5.py
@@ -74,7 +74,7 @@ class InlineObject5(object):
         Additional data to pass to server  # noqa: E501
 
         :param additional_metadata: The additional_metadata of this InlineObject5.  # noqa: E501
-        :type: str
+        :type additional_metadata: str
         """
 
         self._additional_metadata = additional_metadata
@@ -97,7 +97,7 @@ class InlineObject5(object):
         file to upload  # noqa: E501
 
         :param required_file: The required_file of this InlineObject5.  # noqa: E501
-        :type: file
+        :type required_file: file
         """
         if self.local_vars_configuration.client_side_validation and required_file is None:  # noqa: E501
             raise ValueError("Invalid value for `required_file`, must not be `None`")  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/inline_response_default.py b/samples/openapi3/client/petstore/python/petstore_api/models/inline_response_default.py
index 3904d39c9cc..249eb98d3c2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/inline_response_default.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/inline_response_default.py
@@ -68,7 +68,7 @@ class InlineResponseDefault(object):
 
 
         :param string: The string of this InlineResponseDefault.  # noqa: E501
-        :type: Foo
+        :type string: Foo
         """
 
         self._string = string
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/list.py b/samples/openapi3/client/petstore/python/petstore_api/models/list.py
index d58d13e90fb..e21a220f71c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/list.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/list.py
@@ -68,7 +68,7 @@ class List(object):
 
 
         :param _123_list: The _123_list of this List.  # noqa: E501
-        :type: str
+        :type _123_list: str
         """
 
         self.__123_list = _123_list
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py
index f0cfba5073b..8afc875ce51 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/map_test.py
@@ -83,7 +83,7 @@ class MapTest(object):
 
 
         :param map_map_of_string: The map_map_of_string of this MapTest.  # noqa: E501
-        :type: dict(str, dict(str, str))
+        :type map_map_of_string: dict(str, dict(str, str))
         """
 
         self._map_map_of_string = map_map_of_string
@@ -104,7 +104,7 @@ class MapTest(object):
 
 
         :param map_of_enum_string: The map_of_enum_string of this MapTest.  # noqa: E501
-        :type: dict(str, str)
+        :type map_of_enum_string: dict(str, str)
         """
         allowed_values = ["UPPER", "lower"]  # noqa: E501
         if (self.local_vars_configuration.client_side_validation and
@@ -133,7 +133,7 @@ class MapTest(object):
 
 
         :param direct_map: The direct_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type direct_map: dict(str, bool)
         """
 
         self._direct_map = direct_map
@@ -154,7 +154,7 @@ class MapTest(object):
 
 
         :param indirect_map: The indirect_map of this MapTest.  # noqa: E501
-        :type: dict(str, bool)
+        :type indirect_map: dict(str, bool)
         """
 
         self._indirect_map = indirect_map
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
index 5da34f8830e..8aecbf0f558 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/mixed_properties_and_additional_properties_class.py
@@ -78,7 +78,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param uuid: The uuid of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: str
+        :type uuid: str
         """
 
         self._uuid = uuid
@@ -99,7 +99,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param date_time: The date_time of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: datetime
+        :type date_time: datetime
         """
 
         self._date_time = date_time
@@ -120,7 +120,7 @@ class MixedPropertiesAndAdditionalPropertiesClass(object):
 
 
         :param map: The map of this MixedPropertiesAndAdditionalPropertiesClass.  # noqa: E501
-        :type: dict(str, Animal)
+        :type map: dict(str, Animal)
         """
 
         self._map = map
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py b/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py
index 841ce1f18f3..3f4c4e2bd2a 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/model200_response.py
@@ -73,7 +73,7 @@ class Model200Response(object):
 
 
         :param name: The name of this Model200Response.  # noqa: E501
-        :type: int
+        :type name: int
         """
 
         self._name = name
@@ -94,7 +94,7 @@ class Model200Response(object):
 
 
         :param _class: The _class of this Model200Response.  # noqa: E501
-        :type: str
+        :type _class: str
         """
 
         self.__class = _class
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py b/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py
index fdd8d72314a..1009c50ef08 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/model_return.py
@@ -68,7 +68,7 @@ class ModelReturn(object):
 
 
         :param _return: The _return of this ModelReturn.  # noqa: E501
-        :type: int
+        :type _return: int
         """
 
         self.__return = _return
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/name.py b/samples/openapi3/client/petstore/python/petstore_api/models/name.py
index bb2c1fbd73c..6ee8261e782 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/name.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/name.py
@@ -82,7 +82,7 @@ class Name(object):
 
 
         :param name: The name of this Name.  # noqa: E501
-        :type: int
+        :type name: int
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -105,7 +105,7 @@ class Name(object):
 
 
         :param snake_case: The snake_case of this Name.  # noqa: E501
-        :type: int
+        :type snake_case: int
         """
 
         self._snake_case = snake_case
@@ -126,7 +126,7 @@ class Name(object):
 
 
         :param _property: The _property of this Name.  # noqa: E501
-        :type: str
+        :type _property: str
         """
 
         self.__property = _property
@@ -147,7 +147,7 @@ class Name(object):
 
 
         :param _123_number: The _123_number of this Name.  # noqa: E501
-        :type: int
+        :type _123_number: int
         """
 
         self.__123_number = _123_number
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py
index b81eb554e91..e0a26244a48 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/nullable_class.py
@@ -113,7 +113,7 @@ class NullableClass(object):
 
 
         :param integer_prop: The integer_prop of this NullableClass.  # noqa: E501
-        :type: int
+        :type integer_prop: int
         """
 
         self._integer_prop = integer_prop
@@ -134,7 +134,7 @@ class NullableClass(object):
 
 
         :param number_prop: The number_prop of this NullableClass.  # noqa: E501
-        :type: float
+        :type number_prop: float
         """
 
         self._number_prop = number_prop
@@ -155,7 +155,7 @@ class NullableClass(object):
 
 
         :param boolean_prop: The boolean_prop of this NullableClass.  # noqa: E501
-        :type: bool
+        :type boolean_prop: bool
         """
 
         self._boolean_prop = boolean_prop
@@ -176,7 +176,7 @@ class NullableClass(object):
 
 
         :param string_prop: The string_prop of this NullableClass.  # noqa: E501
-        :type: str
+        :type string_prop: str
         """
 
         self._string_prop = string_prop
@@ -197,7 +197,7 @@ class NullableClass(object):
 
 
         :param date_prop: The date_prop of this NullableClass.  # noqa: E501
-        :type: date
+        :type date_prop: date
         """
 
         self._date_prop = date_prop
@@ -218,7 +218,7 @@ class NullableClass(object):
 
 
         :param datetime_prop: The datetime_prop of this NullableClass.  # noqa: E501
-        :type: datetime
+        :type datetime_prop: datetime
         """
 
         self._datetime_prop = datetime_prop
@@ -239,7 +239,7 @@ class NullableClass(object):
 
 
         :param array_nullable_prop: The array_nullable_prop of this NullableClass.  # noqa: E501
-        :type: list[object]
+        :type array_nullable_prop: list[object]
         """
 
         self._array_nullable_prop = array_nullable_prop
@@ -260,7 +260,7 @@ class NullableClass(object):
 
 
         :param array_and_items_nullable_prop: The array_and_items_nullable_prop of this NullableClass.  # noqa: E501
-        :type: list[object]
+        :type array_and_items_nullable_prop: list[object]
         """
 
         self._array_and_items_nullable_prop = array_and_items_nullable_prop
@@ -281,7 +281,7 @@ class NullableClass(object):
 
 
         :param array_items_nullable: The array_items_nullable of this NullableClass.  # noqa: E501
-        :type: list[object]
+        :type array_items_nullable: list[object]
         """
 
         self._array_items_nullable = array_items_nullable
@@ -302,7 +302,7 @@ class NullableClass(object):
 
 
         :param object_nullable_prop: The object_nullable_prop of this NullableClass.  # noqa: E501
-        :type: dict(str, object)
+        :type object_nullable_prop: dict(str, object)
         """
 
         self._object_nullable_prop = object_nullable_prop
@@ -323,7 +323,7 @@ class NullableClass(object):
 
 
         :param object_and_items_nullable_prop: The object_and_items_nullable_prop of this NullableClass.  # noqa: E501
-        :type: dict(str, object)
+        :type object_and_items_nullable_prop: dict(str, object)
         """
 
         self._object_and_items_nullable_prop = object_and_items_nullable_prop
@@ -344,7 +344,7 @@ class NullableClass(object):
 
 
         :param object_items_nullable: The object_items_nullable of this NullableClass.  # noqa: E501
-        :type: dict(str, object)
+        :type object_items_nullable: dict(str, object)
         """
 
         self._object_items_nullable = object_items_nullable
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py b/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py
index 99b2424852f..90f09d8b7d5 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/number_only.py
@@ -68,7 +68,7 @@ class NumberOnly(object):
 
 
         :param just_number: The just_number of this NumberOnly.  # noqa: E501
-        :type: float
+        :type just_number: float
         """
 
         self._just_number = just_number
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/order.py b/samples/openapi3/client/petstore/python/petstore_api/models/order.py
index 8c863cce8fe..8f298aa3d9c 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/order.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/order.py
@@ -93,7 +93,7 @@ class Order(object):
 
 
         :param id: The id of this Order.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -114,7 +114,7 @@ class Order(object):
 
 
         :param pet_id: The pet_id of this Order.  # noqa: E501
-        :type: int
+        :type pet_id: int
         """
 
         self._pet_id = pet_id
@@ -135,7 +135,7 @@ class Order(object):
 
 
         :param quantity: The quantity of this Order.  # noqa: E501
-        :type: int
+        :type quantity: int
         """
 
         self._quantity = quantity
@@ -156,7 +156,7 @@ class Order(object):
 
 
         :param ship_date: The ship_date of this Order.  # noqa: E501
-        :type: datetime
+        :type ship_date: datetime
         """
 
         self._ship_date = ship_date
@@ -179,7 +179,7 @@ class Order(object):
         Order Status  # noqa: E501
 
         :param status: The status of this Order.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["placed", "approved", "delivered"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
@@ -206,7 +206,7 @@ class Order(object):
 
 
         :param complete: The complete of this Order.  # noqa: E501
-        :type: bool
+        :type complete: bool
         """
 
         self._complete = complete
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py b/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py
index c11859114a5..85fe36c7ef0 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/outer_composite.py
@@ -78,7 +78,7 @@ class OuterComposite(object):
 
 
         :param my_number: The my_number of this OuterComposite.  # noqa: E501
-        :type: float
+        :type my_number: float
         """
 
         self._my_number = my_number
@@ -99,7 +99,7 @@ class OuterComposite(object):
 
 
         :param my_string: The my_string of this OuterComposite.  # noqa: E501
-        :type: str
+        :type my_string: str
         """
 
         self._my_string = my_string
@@ -120,7 +120,7 @@ class OuterComposite(object):
 
 
         :param my_boolean: The my_boolean of this OuterComposite.  # noqa: E501
-        :type: bool
+        :type my_boolean: bool
         """
 
         self._my_boolean = my_boolean
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/pet.py b/samples/openapi3/client/petstore/python/petstore_api/models/pet.py
index edbf73f5312..b948a6436db 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/pet.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/pet.py
@@ -91,7 +91,7 @@ class Pet(object):
 
 
         :param id: The id of this Pet.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -112,7 +112,7 @@ class Pet(object):
 
 
         :param category: The category of this Pet.  # noqa: E501
-        :type: Category
+        :type category: Category
         """
 
         self._category = category
@@ -133,7 +133,7 @@ class Pet(object):
 
 
         :param name: The name of this Pet.  # noqa: E501
-        :type: str
+        :type name: str
         """
         if self.local_vars_configuration.client_side_validation and name is None:  # noqa: E501
             raise ValueError("Invalid value for `name`, must not be `None`")  # noqa: E501
@@ -156,7 +156,7 @@ class Pet(object):
 
 
         :param photo_urls: The photo_urls of this Pet.  # noqa: E501
-        :type: list[str]
+        :type photo_urls: list[str]
         """
         if self.local_vars_configuration.client_side_validation and photo_urls is None:  # noqa: E501
             raise ValueError("Invalid value for `photo_urls`, must not be `None`")  # noqa: E501
@@ -179,7 +179,7 @@ class Pet(object):
 
 
         :param tags: The tags of this Pet.  # noqa: E501
-        :type: list[Tag]
+        :type tags: list[Tag]
         """
 
         self._tags = tags
@@ -202,7 +202,7 @@ class Pet(object):
         pet status in the store  # noqa: E501
 
         :param status: The status of this Pet.  # noqa: E501
-        :type: str
+        :type status: str
         """
         allowed_values = ["available", "pending", "sold"]  # noqa: E501
         if self.local_vars_configuration.client_side_validation and status not in allowed_values:  # noqa: E501
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py b/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py
index a84679e98de..3a305087dc2 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/read_only_first.py
@@ -73,7 +73,7 @@ class ReadOnlyFirst(object):
 
 
         :param bar: The bar of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type bar: str
         """
 
         self._bar = bar
@@ -94,7 +94,7 @@ class ReadOnlyFirst(object):
 
 
         :param baz: The baz of this ReadOnlyFirst.  # noqa: E501
-        :type: str
+        :type baz: str
         """
 
         self._baz = baz
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py b/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py
index 396e75bcee5..d2535eb65ac 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/special_model_name.py
@@ -68,7 +68,7 @@ class SpecialModelName(object):
 
 
         :param special_property_name: The special_property_name of this SpecialModelName.  # noqa: E501
-        :type: int
+        :type special_property_name: int
         """
 
         self._special_property_name = special_property_name
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/tag.py b/samples/openapi3/client/petstore/python/petstore_api/models/tag.py
index d6137fdd47f..7492d30d9eb 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/tag.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/tag.py
@@ -73,7 +73,7 @@ class Tag(object):
 
 
         :param id: The id of this Tag.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -94,7 +94,7 @@ class Tag(object):
 
 
         :param name: The name of this Tag.  # noqa: E501
-        :type: str
+        :type name: str
         """
 
         self._name = name
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/user.py b/samples/openapi3/client/petstore/python/petstore_api/models/user.py
index de88bda4cde..0e25f9f1710 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/user.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/user.py
@@ -103,7 +103,7 @@ class User(object):
 
 
         :param id: The id of this User.  # noqa: E501
-        :type: int
+        :type id: int
         """
 
         self._id = id
@@ -124,7 +124,7 @@ class User(object):
 
 
         :param username: The username of this User.  # noqa: E501
-        :type: str
+        :type username: str
         """
 
         self._username = username
@@ -145,7 +145,7 @@ class User(object):
 
 
         :param first_name: The first_name of this User.  # noqa: E501
-        :type: str
+        :type first_name: str
         """
 
         self._first_name = first_name
@@ -166,7 +166,7 @@ class User(object):
 
 
         :param last_name: The last_name of this User.  # noqa: E501
-        :type: str
+        :type last_name: str
         """
 
         self._last_name = last_name
@@ -187,7 +187,7 @@ class User(object):
 
 
         :param email: The email of this User.  # noqa: E501
-        :type: str
+        :type email: str
         """
 
         self._email = email
@@ -208,7 +208,7 @@ class User(object):
 
 
         :param password: The password of this User.  # noqa: E501
-        :type: str
+        :type password: str
         """
 
         self._password = password
@@ -229,7 +229,7 @@ class User(object):
 
 
         :param phone: The phone of this User.  # noqa: E501
-        :type: str
+        :type phone: str
         """
 
         self._phone = phone
@@ -252,7 +252,7 @@ class User(object):
         User Status  # noqa: E501
 
         :param user_status: The user_status of this User.  # noqa: E501
-        :type: int
+        :type user_status: int
         """
 
         self._user_status = user_status
diff --git a/samples/openapi3/server/petstore/python-flask-python2/.openapi-generator/VERSION b/samples/openapi3/server/petstore/python-flask-python2/.openapi-generator/VERSION
index bfbf77eb7fa..d99e7162d01 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/.openapi-generator/VERSION
+++ b/samples/openapi3/server/petstore/python-flask-python2/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
index 20b15fabbd9..5ae8f380ee3 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/controllers/pet_controller.py
@@ -17,7 +17,7 @@ def add_pet(pet):  # noqa: E501
     :param pet: Pet object that needs to be added to the store
     :type pet: dict | bytes
 
-    :rtype: Pet
+    :rtype: None
     """
     if connexion.request.is_json:
         pet = Pet.from_dict(connexion.request.get_json())  # noqa: E501
@@ -86,7 +86,7 @@ def update_pet(pet):  # noqa: E501
     :param pet: Pet object that needs to be added to the store
     :type pet: dict | bytes
 
-    :rtype: Pet
+    :rtype: None
     """
     if connexion.request.is_json:
         pet = Pet.from_dict(connexion.request.get_json())  # noqa: E501
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
index 142289318ae..31100fda527 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/openapi/openapi.yaml
@@ -26,15 +26,6 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
         "405":
           description: Invalid input
       security:
@@ -50,15 +41,6 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
         "400":
           description: Invalid ID supplied
         "404":
diff --git a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
index dc0a8e2deb0..6c031e9f4b1 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask-python2/openapi_server/test/test_pet_controller.py
@@ -41,7 +41,6 @@ class TestPetController(BaseTestCase):
   "status" : "available"
 }
         headers = { 
-            'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': 'Bearer special-key',
         }
@@ -146,7 +145,6 @@ class TestPetController(BaseTestCase):
   "status" : "available"
 }
         headers = { 
-            'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': 'Bearer special-key',
         }
diff --git a/samples/openapi3/server/petstore/python-flask-python2/requirements.txt b/samples/openapi3/server/petstore/python-flask-python2/requirements.txt
index 47350085aa1..55ef66307fc 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/requirements.txt
+++ b/samples/openapi3/server/petstore/python-flask-python2/requirements.txt
@@ -1,8 +1,16 @@
-connexion >= 2.6.0; python_version>="3.6"
-connexion >= 2.3.0; python_version=="3.5"
-connexion >= 2.3.0; python_version=="3.4"
-connexion == 2.4.0; python_version<="2.7"
+connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
+# 2.3 is the last version that supports python 3.4-3.5
+connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
+connexion[swagger-ui] == 2.4.0; python_version<="2.7"
+# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
+# we must peg werkzeug versions below to fix connexion
+# https://github.com/zalando/connexion/pull/1044
+werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
 swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 typing >= 3.5.2.2
+# For specs with timestamps, pyyaml 5.3 broke connexion's spec parsing in python 2.
+# Connexion uses copy.deepcopy() on the spec, thus hitting this bug:
+# https://github.com/yaml/pyyaml/issues/387
+pyyaml < 5.3; python_version<="2.7"
 setuptools >= 21.0.0
diff --git a/samples/openapi3/server/petstore/python-flask-python2/test-requirements.txt b/samples/openapi3/server/petstore/python-flask-python2/test-requirements.txt
index a2626d875ff..0970f28c7c5 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/test-requirements.txt
+++ b/samples/openapi3/server/petstore/python-flask-python2/test-requirements.txt
@@ -1,4 +1,4 @@
 pytest~=4.6.7 # needed for python 2.7+3.4
 pytest-cov>=2.8.1
 pytest-randomly==1.2.3 # needed for python 2.7+3.4
-flask_testing==0.6.1
\ No newline at end of file
+Flask-Testing==0.8.0
diff --git a/samples/openapi3/server/petstore/python-flask-python2/tox.ini b/samples/openapi3/server/petstore/python-flask-python2/tox.ini
index d05c607610c..d63c4ac5aac 100644
--- a/samples/openapi3/server/petstore/python-flask-python2/tox.ini
+++ b/samples/openapi3/server/petstore/python-flask-python2/tox.ini
@@ -1,9 +1,11 @@
 [tox]
 envlist = py27, py3
+skipsdist=True
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
 
 commands=
-   pytest --cov=openapi_server
\ No newline at end of file
+   pytest --cov=openapi_server
diff --git a/samples/openapi3/server/petstore/python-flask/.openapi-generator/VERSION b/samples/openapi3/server/petstore/python-flask/.openapi-generator/VERSION
index bfbf77eb7fa..d99e7162d01 100644
--- a/samples/openapi3/server/petstore/python-flask/.openapi-generator/VERSION
+++ b/samples/openapi3/server/petstore/python-flask/.openapi-generator/VERSION
@@ -1 +1 @@
-4.3.0-SNAPSHOT
\ No newline at end of file
+5.0.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
index 20b15fabbd9..5ae8f380ee3 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/controllers/pet_controller.py
@@ -17,7 +17,7 @@ def add_pet(pet):  # noqa: E501
     :param pet: Pet object that needs to be added to the store
     :type pet: dict | bytes
 
-    :rtype: Pet
+    :rtype: None
     """
     if connexion.request.is_json:
         pet = Pet.from_dict(connexion.request.get_json())  # noqa: E501
@@ -86,7 +86,7 @@ def update_pet(pet):  # noqa: E501
     :param pet: Pet object that needs to be added to the store
     :type pet: dict | bytes
 
-    :rtype: Pet
+    :rtype: None
     """
     if connexion.request.is_json:
         pet = Pet.from_dict(connexion.request.get_json())  # noqa: E501
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
index 142289318ae..31100fda527 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/openapi/openapi.yaml
@@ -26,15 +26,6 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
         "405":
           description: Invalid input
       security:
@@ -50,15 +41,6 @@ paths:
       requestBody:
         $ref: '#/components/requestBodies/Pet'
       responses:
-        "200":
-          content:
-            application/xml:
-              schema:
-                $ref: '#/components/schemas/Pet'
-            application/json:
-              schema:
-                $ref: '#/components/schemas/Pet'
-          description: successful operation
         "400":
           description: Invalid ID supplied
         "404":
diff --git a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
index be94fa8d5af..2e9944b3cc3 100644
--- a/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
+++ b/samples/openapi3/server/petstore/python-flask/openapi_server/test/test_pet_controller.py
@@ -41,7 +41,6 @@ class TestPetController(BaseTestCase):
   "status" : "available"
 }
         headers = { 
-            'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': 'Bearer special-key',
         }
@@ -146,7 +145,6 @@ class TestPetController(BaseTestCase):
   "status" : "available"
 }
         headers = { 
-            'Accept': 'application/json',
             'Content-Type': 'application/json',
             'Authorization': 'Bearer special-key',
         }
diff --git a/samples/openapi3/server/petstore/python-flask/requirements.txt b/samples/openapi3/server/petstore/python-flask/requirements.txt
index 2639eedf136..72ed547c442 100644
--- a/samples/openapi3/server/petstore/python-flask/requirements.txt
+++ b/samples/openapi3/server/petstore/python-flask/requirements.txt
@@ -1,7 +1,10 @@
-connexion >= 2.6.0; python_version>="3.6"
-connexion >= 2.3.0; python_version=="3.5"
-connexion >= 2.3.0; python_version=="3.4"
-connexion == 2.4.0; python_version<="2.7"
+connexion[swagger-ui] >= 2.6.0; python_version>="3.6"
+# 2.3 is the last version that supports python 3.4-3.5
+connexion[swagger-ui] <= 2.3.0; python_version=="3.5" or python_version=="3.4"
+# connexion requires werkzeug but connexion < 2.4.0 does not install werkzeug
+# we must peg werkzeug versions below to fix connexion
+# https://github.com/zalando/connexion/pull/1044
+werkzeug == 0.16.1; python_version=="3.5" or python_version=="3.4"
 swagger-ui-bundle >= 0.0.2
 python_dateutil >= 2.6.0
 setuptools >= 21.0.0
diff --git a/samples/openapi3/server/petstore/python-flask/test-requirements.txt b/samples/openapi3/server/petstore/python-flask/test-requirements.txt
index a2626d875ff..0970f28c7c5 100644
--- a/samples/openapi3/server/petstore/python-flask/test-requirements.txt
+++ b/samples/openapi3/server/petstore/python-flask/test-requirements.txt
@@ -1,4 +1,4 @@
 pytest~=4.6.7 # needed for python 2.7+3.4
 pytest-cov>=2.8.1
 pytest-randomly==1.2.3 # needed for python 2.7+3.4
-flask_testing==0.6.1
\ No newline at end of file
+Flask-Testing==0.8.0
diff --git a/samples/openapi3/server/petstore/python-flask/tox.ini b/samples/openapi3/server/petstore/python-flask/tox.ini
index cff71191e6c..f66b2d84cda 100644
--- a/samples/openapi3/server/petstore/python-flask/tox.ini
+++ b/samples/openapi3/server/petstore/python-flask/tox.ini
@@ -1,9 +1,11 @@
 [tox]
 envlist = py3
+skipsdist=True
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt
      -r{toxinidir}/test-requirements.txt
+	 {toxinidir}
 
 commands=
-   pytest --cov=openapi_server
\ No newline at end of file
+   pytest --cov=openapi_server