diff --git a/pom.xml b/pom.xml
index 629835dbcbf..3fc08a40edc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1201,7 +1201,7 @@
     </repositories>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-codegen-generators-version>1.0.56</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.57-SNAPSHOT</swagger-codegen-generators-version>
         <swagger-core-version>2.2.28</swagger-core-version>
         <swagger-core-version-v1>1.6.15</swagger-core-version-v1>
         <swagger-parser-version>2.1.25</swagger-parser-version>
diff --git a/samples/client/petstore/java/feign/.swagger-codegen/VERSION b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
index 86820ab0dd0..6cdf9d22414 100644
--- a/samples/client/petstore/java/feign/.swagger-codegen/VERSION
+++ b/samples/client/petstore/java/feign/.swagger-codegen/VERSION
@@ -1 +1 @@
-3.0.36-SNAPSHOT
\ No newline at end of file
+3.0.67
\ No newline at end of file
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index dac6d50f0cb..5f2c47638af 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -6,7 +6,7 @@ version = '1.0.0'
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.+'
@@ -15,7 +15,7 @@ buildscript {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 
@@ -76,14 +76,17 @@ if(hasProperty('target') && target == 'android') {
 } else {
 
     apply plugin: 'java'
-    apply plugin: 'maven'
+    apply plugin: 'maven-publish'
 
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 
-    install {
-        repositories.mavenInstaller {
-            pom.artifactId = 'swagger-petstore-feign'
+    publishing {
+        publications {
+            maven(MavenPublication) {
+               artifactId = 'swagger-petstore-feign'
+               from components.java
+            }
         }
     }
 
@@ -96,26 +99,26 @@ if(hasProperty('target') && target == 'android') {
 ext {
     swagger_annotations_version = "2.0.0"
     jackson_version = "2.10.1"
-    feign_version = "11.6"
+    feign_version = "13.5"
     feign_form_version = "3.8.0"
     junit_version = "4.12"
     oltu_version = "1.0.2"
 }
 
 dependencies {
-    compile "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
-    compile "io.github.openfeign:feign-core:$feign_version"
-    compile "io.github.openfeign:feign-jackson:$feign_version"
-    compile "io.github.openfeign:feign-slf4j:$feign_version"
-    compile "io.github.openfeign.form:feign-form:$feign_form_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_version"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
-    compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
+    implementation "io.swagger.core.v3:swagger-annotations:$swagger_annotations_version"
+    implementation "io.github.openfeign:feign-core:$feign_version"
+    implementation "io.github.openfeign:feign-jackson:$feign_version"
+    implementation "io.github.openfeign:feign-slf4j:$feign_version"
+    implementation "io.github.openfeign.form:feign-form:$feign_form_version"
+    implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    implementation ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version") {
         exclude group: "org.json", module: "json"
     }
-    compile "org.json:json:20180130"
-    compile "com.brsanthu:migbase64:2.2"
-    testCompile "junit:junit:$junit_version"
+    implementation "org.json:json:20180130"
+    implementation "com.brsanthu:migbase64:2.2"
+    testImplementation "junit:junit:$junit_version"
 }
diff --git a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar
index 2c6137b8789..d64cd491770 100644
Binary files a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar and b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
index b7a36473955..1af9e0930b8 100644
--- a/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
+++ b/samples/client/petstore/java/feign/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Tue May 17 23:08:05 CST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index 8fa28b72df6..5096df21357 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -248,9 +248,9 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>2.0.0</swagger-core-version>
-    <feign-version>11.6</feign-version>
+    <feign-version>13.5</feign-version>
     <feign-form-version>3.8.0</feign-form-version>
-    <jackson-version>2.10.1</jackson-version>
+    <jackson-version>2.15.2</jackson-version>
     <junit-version>4.13.1</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.2</oltu-version>
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
index ee0a1be385f..67a82f949ff 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java
@@ -20,6 +20,7 @@
 import io.swagger.client.auth.*;
 import io.swagger.client.auth.OAuth.AccessTokenListener;
 
+
 public class ApiClient {
   public interface Api {}
 
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
index d5665df3422..74e797c5162 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/StringUtil.java
@@ -12,6 +12,7 @@
 
 package io.swagger.client;
 
+
 public class StringUtil {
   /**
    * Check if the given array contains the given value (with case-insensitive comparison).
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java
index 2d980496ea6..fcd6a093523 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnimalApi.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface AnimalApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java
index 54496ba5d8f..7269e999347 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/AnotherFakeApi.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface AnotherFakeApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/DogApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/DogApi.java
index 3204404dd78..f6ec2c606e3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/DogApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/DogApi.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface DogApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
index 8007cba23b9..040ec9493f4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java
@@ -17,6 +17,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface FakeApi extends ApiClient.Api {
 
   /**
@@ -86,7 +87,7 @@ public interface FakeApi extends ApiClient.Api {
    */
   @RequestLine("POST /fake")
   @Headers({
-      "Content-Type: application/xml; charset&#x3D;utf-8",
+      "Content-Type: application/xml; charset=utf-8",
       "Accept: */*",
   })
   void testEndpointParameters(FakeBody body);
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
index 4b556e6cac1..a0d26c2b5ea 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeClassnameTags123Api.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface FakeClassnameTags123Api extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
index 887ca017504..15b940782c4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface PetApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
index c1808ec794a..457126cbcd7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/StoreApi.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface StoreApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
index 9042c3c1280..4e3cb6d7fe3 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/UserApi.java
@@ -11,6 +11,7 @@
 import java.util.Map;
 import feign.*;
 
+
 public interface UserApi extends ApiClient.Api {
 
   /**
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
index c15e64fa094..2351670f6b5 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/auth/OAuth.java
@@ -4,6 +4,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
@@ -95,7 +96,7 @@ public synchronized void updateAccessToken(RequestTemplate template) {
         try {
             accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
         } catch (Exception e) {
-            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
+            throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, (Date) null, template.request());
         }
         if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
             setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
index 081150136e0..f61dc0da3ca 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AdditionalPropertiesClass.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class AdditionalPropertiesClass {
   @JsonProperty("map_property")
   private Map<String, String> mapProperty = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryCategory.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryCategory.java
index 78c327c9714..9784f8f8e45 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryCategory.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryCategory.java
@@ -25,6 +25,7 @@
  */
 
 
+
 public class AllOfSubCategoryCategory extends Category {
   @JsonProperty("foo")
   private Boolean foo = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryPetsItems.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryPetsItems.java
index dfb40fbe84b..9e2dfbf27e4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryPetsItems.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllOfSubCategoryPetsItems.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class AllOfSubCategoryPetsItems extends Pet {
 
   @Override
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllPetsResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllPetsResponse.java
index c2d0f40a041..1e8e90f54f4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllPetsResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AllPetsResponse.java
@@ -21,6 +21,7 @@
  */
 
 
+
 public class AllPetsResponse extends ArrayList<OneOfAllPetsResponseItems> {
 
   @Override
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
index a0c711f26ac..d39c1c4ee25 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Animal.java
@@ -25,6 +25,7 @@
  * Animal
  */
 
+
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true )
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalAnimalIdBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalAnimalIdBody.java
index 85e180d4637..4e7c7f388ae 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalAnimalIdBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalAnimalIdBody.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class AnimalAnimalIdBody {
   @JsonProperty("name")
   private String name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
index 3c4f1dbf34d..a8e39522afd 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/AnimalFarm.java
@@ -22,6 +22,7 @@
  */
 
 
+
 public class AnimalFarm extends ArrayList<Animal> {
 
   @Override
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
index 5d5046b7709..732d2337556 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfArrayOfNumberOnly.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class ArrayOfArrayOfNumberOnly {
   @JsonProperty("ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
index 52385ce9eaa..a7ad0c2c624 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayOfNumberOnly.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class ArrayOfNumberOnly {
   @JsonProperty("ArrayNumber")
   private List<BigDecimal> arrayNumber = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
index 916130773b4..1a4cb7f079e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ArrayTest.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class ArrayTest {
   @JsonProperty("array_of_string")
   private List<String> arrayOfString = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
index bb4e9e8d507..fbeb1867a74 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Capitalization.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class Capitalization {
   @JsonProperty("smallCamel")
   private String smallCamel = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
index 1884158dc6d..ff7638e2c59 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Cat.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class Cat extends Animal implements OneOfAllPetsResponseItems, OneOfSinglePetResponsePet {
   @JsonProperty("declawed")
   private Boolean declawed = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
index 0018e0dce5e..ffdba178d69 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Category.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class Category {
   @JsonProperty("id")
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
index 982745da3f7..1034fdd93ca 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ClassModel.java
@@ -23,6 +23,7 @@
  */
 @Schema(description = "Model for testing model with \"_class\" property")
 
+
 public class ClassModel {
   @JsonProperty("_class")
   private String propertyClass = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
index 5bb02b4976c..3f29e11cd4d 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Client.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class Client {
   @JsonProperty("client")
   private String client = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
index e9a493f798a..6c1978f0638 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Dog.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class Dog extends Animal implements OneOfAllPetsResponseItems, OneOfSinglePetResponsePet {
   @JsonProperty("breed")
   private String breed = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/DogDogIdBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/DogDogIdBody.java
index 95d7a203539..c7bf23c6994 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/DogDogIdBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/DogDogIdBody.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class DogDogIdBody {
   @JsonProperty("name")
   private String name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
index 4f3885a64f0..7193977cd02 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumArrays.java
@@ -25,6 +25,7 @@
  */
 
 
+
 public class EnumArrays {
   /**
    * Gets or Sets justSymbol
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumFormBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumFormBody.java
index 069aeeab685..30531a3ed5e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumFormBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumFormBody.java
@@ -25,6 +25,7 @@
  */
 
 
+
 public class EnumFormBody {
   /**
    * Gets or Sets enumFormStringArray
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
index c82918ab858..573276ed910 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/EnumTest.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class EnumTest {
   /**
    * Gets or Sets enumString
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody.java
index dfd4aa268e9..685aaeda491 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody.java
@@ -27,6 +27,7 @@
  */
 
 
+
 public class FakeBody {
   @JsonProperty("integer")
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody1.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody1.java
index 245d60dc227..4de88d13edd 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody1.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeBody1.java
@@ -27,6 +27,7 @@
  */
 
 
+
 public class FakeBody1 {
   @JsonProperty("integer")
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeJsonFormDataBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeJsonFormDataBody.java
index eb4d60ed548..d2d081281e1 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeJsonFormDataBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FakeJsonFormDataBody.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class FakeJsonFormDataBody {
   @JsonProperty("param")
   private String param = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
index 9e8178fa1ef..3d77f3baf4b 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/FormatTest.java
@@ -28,6 +28,7 @@
  */
 
 
+
 public class FormatTest {
   @JsonProperty("integer")
   private Integer integer = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
index bd46e50e836..24815c3d51e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/HasOnlyReadOnly.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class HasOnlyReadOnly {
   @JsonProperty("bar")
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/List.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/List.java
deleted file mode 100644
index 4903ad24868..00000000000
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/List.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Swagger Petstore
- * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
- *
- * OpenAPI spec version: 1.0.0
- * Contact: apiteam@swagger.io
- *
- * NOTE: This class is auto generated by the swagger code generator program.
- * https://github.com/swagger-api/swagger-codegen.git
- * Do not edit the class manually.
- */
-
-package io.swagger.client.model;
-
-import java.util.Objects;
-import java.util.Arrays;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.v3.oas.annotations.media.Schema;
-/**
- * List
- */
-
-
-public class List {
-  @JsonProperty("123-list")
-  private String _123List = null;
-
-  public List _123List(String _123List) {
-    this._123List = _123List;
-    return this;
-  }
-
-   /**
-   * Get _123List
-   * @return _123List
-  **/
-  @Schema(description = "")
-  public String get123List() {
-    return _123List;
-  }
-
-  public void set123List(String _123List) {
-    this._123List = _123List;
-  }
-
-
-  @Override
-  public boolean equals(java.lang.Object o) {
-    if (this == o) {
-      return true;
-    }
-    if (o == null || getClass() != o.getClass()) {
-      return false;
-    }
-    List list = (List) o;
-    return Objects.equals(this._123List, list._123List);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(_123List);
-  }
-
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class List {\n");
-    
-    sb.append("    _123List: ").append(toIndentedString(_123List)).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/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
index 793a1a598ce..6b4ca227130 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MapTest.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class MapTest {
   @JsonProperty("map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a3220125685..68d4eb3eec2 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -29,6 +29,7 @@
  */
 
 
+
 public class MixedPropertiesAndAdditionalPropertiesClass {
   @JsonProperty("uuid")
   private UUID uuid = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
index 4469a952297..c01d5b301cf 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Model200Response.java
@@ -23,6 +23,7 @@
  */
 @Schema(description = "Model for testing model name starting with number")
 
+
 public class Model200Response {
   @JsonProperty("name")
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
index 1cd7e5b55f8..e96060a7a19 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelApiResponse.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class ModelApiResponse {
   @JsonProperty("code")
   private Integer code = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
index 8fab6dd51ed..52d47a93d78 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ModelReturn.java
@@ -23,6 +23,7 @@
  */
 @Schema(description = "Model for testing reserved words")
 
+
 public class ModelReturn {
   @JsonProperty("return")
   private Integer _return = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
index 51d8e2abec8..d0c7a10446f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Name.java
@@ -23,6 +23,7 @@
  */
 @Schema(description = "Model for testing model name same as property name")
 
+
 public class Name {
   @JsonProperty("name")
   private Integer name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NullableEnumModel.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NullableEnumModel.java
index b69c078800a..e78e6839f76 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NullableEnumModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NullableEnumModel.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class NullableEnumModel {
   /**
    * Gets or Sets enumProp
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
index 47b669ab2f8..ade9fbc0b7d 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/NumberOnly.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class NumberOnly {
   @JsonProperty("JustNumber")
   private BigDecimal justNumber = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfAllPetsResponseItems.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfAllPetsResponseItems.java
index f98cbf3cf42..deadb6f0b2e 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfAllPetsResponseItems.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfAllPetsResponseItems.java
@@ -20,7 +20,7 @@
 @JsonTypeInfo(
   use = JsonTypeInfo.Id.NAME,
   include = JsonTypeInfo.As.PROPERTY,
-  property = "type")
+  property = "")
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat")
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfSinglePetResponsePet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfSinglePetResponsePet.java
index a1d4583abb2..5ad199814f4 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfSinglePetResponsePet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OneOfSinglePetResponsePet.java
@@ -20,7 +20,7 @@
 @JsonTypeInfo(
   use = JsonTypeInfo.Id.NAME,
   include = JsonTypeInfo.As.PROPERTY,
-  property = "type")
+  property = "")
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
   @JsonSubTypes.Type(value = Cat.class, name = "Cat")
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
index 247b2ffc030..dae8eb60f25 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Order.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class Order {
   @JsonProperty("id")
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
index 4c6d1a8fe0a..e0a004081f2 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/OuterComposite.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class OuterComposite {
   @JsonProperty("my_number")
   private BigDecimal myNumber = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
index 29b91669662..ce2ff508ee7 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Pet.java
@@ -27,6 +27,7 @@
  */
 
 
+
 public class Pet {
   @JsonProperty("id")
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetIdUploadImageBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetIdUploadImageBody.java
index ba1e738bfee..8304d7bfe33 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetIdUploadImageBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetIdUploadImageBody.java
@@ -24,6 +24,7 @@
  */
 
 
+
 public class PetIdUploadImageBody {
   @JsonProperty("additionalMetadata")
   private String additionalMetadata = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetPetIdBody.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetPetIdBody.java
index 6920b8f669e..5d748ada2c2 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetPetIdBody.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/PetPetIdBody.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class PetPetIdBody {
   @JsonProperty("name")
   private String name = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
index 97a20d6a8b1..44950dc90c8 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/ReadOnlyFirst.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class ReadOnlyFirst {
   @JsonProperty("bar")
   private String bar = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SinglePetResponse.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SinglePetResponse.java
index 5b795ea1a95..9e359f71dbe 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SinglePetResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SinglePetResponse.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class SinglePetResponse {
   @JsonProperty("pet")
   private OneOfSinglePetResponsePet pet = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
index dac81cc49be..4be20a7db67 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SpecialModelName.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class SpecialModelName {
   @JsonProperty("$special[property.name]")
   private Long $specialPropertyName = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SubCategory.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SubCategory.java
index 97c90633ca4..f99f89db147 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SubCategory.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/SubCategory.java
@@ -26,6 +26,7 @@
  */
 
 
+
 public class SubCategory {
   @JsonProperty("category")
   private AllOfSubCategoryCategory category = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
index b277a46b60f..ae22428231f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/Tag.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class Tag {
   @JsonProperty("id")
   private Long id = null;
diff --git a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
index 46fe1b2ea7b..f9798915d6f 100644
--- a/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/User.java
@@ -23,6 +23,7 @@
  */
 
 
+
 public class User {
   @JsonProperty("id")
   private Long id = null;